August 2011 - bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/test/script.lisp
by BKNR Commits 29 Aug '11

29 Aug '11

Revision: 4673 Author: hans URL: http://bknr.net/trac/changeset/4673 fix range response tests U trunk/thirdparty/hunchentoot/test/script.lisp Modified: trunk/thirdparty/hunchentoot/test/script.lisp =================================================================== --- trunk/thirdparty/hunchentoot/test/script.lisp 2011-08-29 07:42:22 UTC (rev 4672) +++ trunk/thirdparty/hunchentoot/test/script.lisp 2011-08-29 07:42:59 UTC (rev 4673) @@ -136,7 +136,7 @@ (let* ((range-test-file-size (* 256 1024)) ; large enough to have hunchentoot use multiple buffers when reading back data, should be aligned to 1024 (range-test-buffer (make-array range-test-file-size :element-type '(unsigned-byte 8))) (uploaded-file-url "files/?path=user-stream") ; The uploaded file will appear under the name "user-stream" in hunchentoot - (expected-content-range (format nil "bytes 0-~D/*" range-test-file-size))) + (expected-content-range (format nil "bytes 0-~D/*" (1- range-test-file-size)))) (dotimes (i range-test-file-size) (setf (aref range-test-buffer i) (random 256))) @@ -156,7 +156,7 @@ (http-request uploaded-file-url :range '(0 0)) (http-assert 'status-code 206) (http-assert 'body 'equalp (subseq range-test-buffer 0 1)) - (http-assert-header :content-range expected-content-range) + (http-assert-header :content-range (format nil "bytes 0-0")) (say " End out of range") (http-request uploaded-file-url :range (list 0 range-test-file-size)) @@ -175,7 +175,7 @@ (http-request uploaded-file-url :range (list start-offset (1- length))) (http-assert 'status-code 206) (http-assert 'body 'equalp (subseq range-test-buffer start-offset length)) - (http-assert-header :content-range expected-content-range))) + (http-assert-header :content-range (format nil "bytes ~D-~D" start-offset (1- length))))) (values)))

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/misc.lisp
by BKNR Commits 29 Aug '11

29 Aug '11

Revision: 4672 Author: hans URL: http://bknr.net/trac/changeset/4672 report acceptable ranges in 416 response U trunk/thirdparty/hunchentoot/misc.lisp Modified: trunk/thirdparty/hunchentoot/misc.lisp =================================================================== --- trunk/thirdparty/hunchentoot/misc.lisp 2011-08-29 07:11:05 UTC (rev 4671) +++ trunk/thirdparty/hunchentoot/misc.lisp 2011-08-29 07:42:22 UTC (rev 4672) @@ -136,7 +136,8 @@ end (parse-integer end)) (when (or (< start 0) (>= end (file-length file))) - (setf (return-code*) +http-requested-range-not-satisfiable+) + (setf (return-code*) +http-requested-range-not-satisfiable+ + (header-out :content-range) (format nil "bytes 0-~D/*" (1- (file-length file)))) (throw 'handler-done (format nil "invalid request range (requested ~D-~D, accepted 0-~D)" start end (1- (file-length file)))))

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/misc.lisp
by BKNR Commits 29 Aug '11

29 Aug '11

Revision: 4671 Author: hans URL: http://bknr.net/trac/changeset/4671 Range handling fixes: Add "Accept-Ranges" header to static file responses, report range only in partial responses, Fix off-by-one errors (ranges are inclusive). Thanks to Wukix Inc. for reporting. U trunk/thirdparty/hunchentoot/misc.lisp Modified: trunk/thirdparty/hunchentoot/misc.lisp =================================================================== --- trunk/thirdparty/hunchentoot/misc.lisp 2011-08-29 05:42:50 UTC (rev 4670) +++ trunk/thirdparty/hunchentoot/misc.lisp 2011-08-29 07:11:05 UTC (rev 4671) @@ -139,10 +139,11 @@ (setf (return-code*) +http-requested-range-not-satisfiable+) (throw 'handler-done (format nil "invalid request range (requested ~D-~D, accepted 0-~D)" - start end (file-length file)))) + start end (1- (file-length file))))) (file-position file start) (setf (return-code*) +http-partial-content+ - bytes-to-send (1+ (- end start)))) + bytes-to-send (1+ (- end start)) + (header-out :content-range) (format nil "bytes ~D-~D/*" start end))) bytes-to-send)) (defun handle-static-file (pathname &optional content-type) @@ -162,14 +163,14 @@ (setf (content-type*) (or content-type (mime-type pathname) "application/octet-stream") - (header-out :last-modified) (rfc-1123-date time)) + (header-out :last-modified) (rfc-1123-date time) + (header-out :accept-ranges) "bytes") (handle-if-modified-since time) (with-open-file (file pathname :direction :input :element-type 'octet :if-does-not-exist nil) - (setf (header-out :content-range) (format nil "bytes 0-~D/*" (1- (file-length file))) - bytes-to-send (maybe-handle-range-header file) + (setf bytes-to-send (maybe-handle-range-header file) (content-length*) bytes-to-send) (let ((out (send-headers)) (buf (make-array +buffer-length+ :element-type 'octet)))

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/misc.lisp
by BKNR Commits 29 Aug '11

29 Aug '11

Revision: 4670 Author: hans URL: http://bknr.net/trac/changeset/4670 Set content-type and last-modified headers of served static files before handling if-modified-since, thanks to Wukix Inc. for reporting. U trunk/thirdparty/hunchentoot/misc.lisp Modified: trunk/thirdparty/hunchentoot/misc.lisp =================================================================== --- trunk/thirdparty/hunchentoot/misc.lisp 2011-08-16 07:47:58 UTC (rev 4669) +++ trunk/thirdparty/hunchentoot/misc.lisp 2011-08-29 05:42:50 UTC (rev 4670) @@ -159,16 +159,16 @@ (let ((time (or (file-write-date pathname) (get-universal-time))) bytes-to-send) + (setf (content-type*) (or content-type + (mime-type pathname) + "application/octet-stream") + (header-out :last-modified) (rfc-1123-date time)) (handle-if-modified-since time) (with-open-file (file pathname :direction :input :element-type 'octet :if-does-not-exist nil) - (setf (content-type*) (or content-type - (mime-type pathname) - "application/octet-stream") - (header-out :content-range) (format nil "bytes 0-~D/*" (file-length file)) - (header-out :last-modified) (rfc-1123-date time) + (setf (header-out :content-range) (format nil "bytes 0-~D/*" (1- (file-length file))) bytes-to-send (maybe-handle-range-header file) (content-length*) bytes-to-send) (let ((out (send-headers))

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/
by BKNR Commits 16 Aug '11

16 Aug '11

Revision: 4669 Author: hans URL: http://bknr.net/trac/changeset/4669 ACL modern mode fixes U trunk/thirdparty/hunchentoot/packages.lisp U trunk/thirdparty/hunchentoot/test/packages.lisp Change set too large, please see URL above

1 0