suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converting request-bindings/raw to bytes

Browse Source 
svn: r398
This commit is contained in:
Jay McCarthy 2005-07-19 21:41:12 +00:00
parent 2928d3e98b
commit d22090f73d
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
collects/web-server/request-parsing.ss
View File

@ -23,7 +23,9 @@
;; bindings? any/c -> boolean ;; bindings? any/c -> boolean
;; is this a binding ;; is this a binding
(define binding? (define binding?
(cons/c symbol? string?)) (cons/c symbol?
(union string?
bytes?)))
(provide/contract (provide/contract
[struct request ([method symbol?] [uri url?] [headers (listof header?)] [struct request ([method symbol?] [uri url?] [headers (listof header?)]
@ -169,8 +171,8 @@
(map (lambda (part) (map (lambda (part)
;; more here - better checks, avoid string-append ;; more here - better checks, avoid string-append
(cons (get-field-name (cdr (assq 'content-disposition (car part)))) (cons (get-field-name (cdr (assq 'content-disposition (car part))))
(apply string-append (cdr part)))) (apply bytes-append (cdr part))))
(read-mime-multipart (bytes->string/utf-8 (cadr content-boundary)) (connection-i-port conn))))] (read-mime-multipart (cadr content-boundary) (connection-i-port conn))))]
[else [else
(let ([len-str (assq 'content-length headers)] (let ([len-str (assq 'content-length headers)]
[in (connection-i-port conn)]) [in (connection-i-port conn)])
@ -199,16 +201,16 @@
;; ************************************************** ;; **************************************************
;; read-mime-multipart ;; read-mime-multipart
; read-mime-multipart : str iport -> (listof part) ; read-mime-multipart : bytes iport -> (listof part)
(define (read-mime-multipart boundary in) (define (read-mime-multipart boundary in)
(let* ([boundary-len (string-length boundary)] (let* ([boundary-len (bytes-length boundary)]
[start-boundary (string-append "--" boundary)] [start-boundary (bytes-append #"--" boundary)]
[end-boundary (string-append start-boundary "--")]) [end-boundary (bytes-append start-boundary #"--")])
(let skip-preamble () (let skip-preamble ()
(let ([line (read-line in 'return-linefeed)]) (let ([line (read-bytes-line in 'return-linefeed)])
(cond (cond
[(string=? line start-boundary) [(bytes=? line start-boundary)
(let read-parts () (let read-parts ()
(let ([headers (read-headers in)]) (let ([headers (read-headers in)])
(let read-mime-part-body ([more-k (lambda (contents) (let read-mime-part-body ([more-k (lambda (contents)
@ -218,27 +220,27 @@
[end-k (lambda (contents) [end-k (lambda (contents)
(list (construct-mime-part (list (construct-mime-part
headers contents)))]) headers contents)))])
(let ([line (read-line in 'return-linefeed)]) (let ([line (read-bytes-line in 'return-linefeed)])
(cond (cond
[(string=? line start-boundary) [(bytes=? line start-boundary)
(more-k null)] (more-k null)]
[(string=? line end-boundary) [(bytes=? line end-boundary)
(end-k null)] (end-k null)]
[else (read-mime-part-body [else (read-mime-part-body
(lambda (x) (more-k (cons line x))) (lambda (x) (more-k (cons line x)))
(lambda (x) (end-k (cons line x))))])))))] (lambda (x) (end-k (cons line x))))])))))]
[(string=? line end-boundary) null] [(bytes=? line end-boundary) null]
[else (skip-preamble)]))))) [else (skip-preamble)])))))
; more here - use structure, perhaps ; more here - use structure, perhaps
; construct-mime-part : (listof header) (listof str) -> part ; construct-mime-part : (listof header) (listof bytes) -> part
(define (construct-mime-part headers body) (define (construct-mime-part headers body)
(cons headers (cons headers
(cond (cond
[(null? body) null] [(null? body) null]
[else (cons (car body) [else (cons (car body)
(foldr (lambda (str acc) (foldr (lambda (byt acc)
(list* CR-NL str acc)) (list* (string->bytes/utf-8 CR-NL) byt acc))
null null
(cdr body)))]))) (cdr body)))])))

3
notes/mzscheme/HISTORY
View File

@ -1,3 +1,6 @@
Version 299.108
Changed collects/web-server request-bindings/raw
to return an alist of bytes, not strings.
Version 299.107 Version 299.107
Changed expansion of internal definitions so that local Changed expansion of internal definitions so that local