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

[bknr-cvs] edi changed tags/thirdparty/drakma-1.2.2/
by BKNR Commits 10 Jul '10

10 Jul '10

Revision: 4572 Author: edi URL: http://bknr.net/trac/changeset/4572 Tag Drakma 1.2.2 A tags/thirdparty/drakma-1.2.2/

1 0

[bknr-cvs] edi changed trunk/thirdparty/drakma/
by BKNR Commits 10 Jul '10

10 Jul '10

Revision: 4571 Author: edi URL: http://bknr.net/trac/changeset/4571 Prepare for 1.2.2 release U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/drakma.asd Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2010-07-10 10:08:53 UTC (rev 4570) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2010-07-10 10:22:16 UTC (rev 4571) @@ -1,3 +1,7 @@ +Version 1.2.2 +2010-07-10 +Make sure pathless URIs work (Hans Hübner, Manuel Odendahl) + Version 1.2.1 2010-05-19 Fix a couple of typos (thanks to Stelian Ionescu, Giovanni Gigante, and Zach Beane) Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2010-07-10 10:08:53 UTC (rev 4570) +++ trunk/thirdparty/drakma/doc/index.html 2010-07-10 10:22:16 UTC (rev 4571) @@ -656,7 +656,7 @@ Drakma together with this documentation can be downloaded from <a href="http://weitz.de/files/drakma.tar.gz">http://weitz.de/files/drakma.tar.gz</a>. -The current version is 1.2.1. Drakma can be installed +The current version is 1.2.2. Drakma can be installed via <a href="http://www.cliki.net/asdf">ASDF</a> and depends on the open source libraries <a href="http://www.cliki.net/cl-base64">CL-BASE64</a> (use Modified: trunk/thirdparty/drakma/drakma.asd =================================================================== --- trunk/thirdparty/drakma/drakma.asd 2010-07-10 10:08:53 UTC (rev 4570) +++ trunk/thirdparty/drakma/drakma.asd 2010-07-10 10:22:16 UTC (rev 4571) @@ -38,7 +38,7 @@ (in-package :drakma-asd) -(defvar *drakma-version-string* "1.2.1" +(defvar *drakma-version-string* "1.2.2" "Drakma's version number as a string.") ;; we export its name so we can import it later

1 0

[bknr-cvs] hans changed trunk/thirdparty/drakma/request.lisp
by BKNR Commits 10 Jul '10

10 Jul '10

Revision: 4570 Author: hans URL: http://bknr.net/trac/changeset/4570 Do not send the fragment in the HTTP request (http://tools.ietf.org/html/rfc3986#section-4.3) U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2010-07-10 10:00:21 UTC (rev 4569) +++ trunk/thirdparty/drakma/request.lisp 2010-07-10 10:08:53 UTC (rev 4570) @@ -535,8 +535,7 @@ (not proxying-https-p)) uri) (t (make-instance 'uri :path (or (uri-path uri) "/") - :query (uri-query uri) - :fragment (uri-fragment uri)))) + :query (uri-query uri)))) nil) (string-upcase protocol)) (write-header "Host" "~A~@[:~A~]" (uri-host uri) (non-default-port uri))

1 0

[bknr-cvs] hans changed trunk/thirdparty/drakma/request.lisp
by BKNR Commits 10 Jul '10

10 Jul '10

Revision: 4569 Author: hans URL: http://bknr.net/trac/changeset/4569 Improved fix for the pathless uri problem. U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2010-07-10 09:36:48 UTC (rev 4568) +++ trunk/thirdparty/drakma/request.lisp 2010-07-10 10:00:21 UTC (rev 4569) @@ -533,8 +533,10 @@ (render-uri (cond ((and proxy (null stream) (not proxying-https-p)) uri) - (t (uri (or (uri-path uri) - "/")))) + (t (make-instance 'uri + :path (or (uri-path uri) "/") + :query (uri-query uri) + :fragment (uri-fragment uri)))) nil) (string-upcase protocol)) (write-header "Host" "~A~@[:~A~]" (uri-host uri) (non-default-port uri))

1 0

[bknr-cvs] hans changed trunk/thirdparty/drakma/request.lisp
by BKNR Commits 10 Jul '10

10 Jul '10

Revision: 4568 Author: hans URL: http://bknr.net/trac/changeset/4568 Fix path-less URI fetching. U trunk/thirdparty/drakma/request.lisp Modified: trunk/thirdparty/drakma/request.lisp =================================================================== --- trunk/thirdparty/drakma/request.lisp 2010-07-09 09:44:23 UTC (rev 4567) +++ trunk/thirdparty/drakma/request.lisp 2010-07-10 09:36:48 UTC (rev 4568) @@ -533,12 +533,8 @@ (render-uri (cond ((and proxy (null stream) (not proxying-https-p)) uri) - (t (copy-uri uri - :scheme nil - :host nil - :port nil - :parsed-path nil - :plist nil))) + (t (uri (or (uri-path uri) + "/")))) nil) (string-upcase protocol)) (write-header "Host" "~A~@[:~A~]" (uri-host uri) (non-default-port uri))

1 0

[bknr-cvs] hans changed trunk/thirdparty/cxml/.git/objects/
by BKNR Commits 09 Jul '10

09 Jul '10

Revision: 4567 Author: hans URL: http://bknr.net/trac/changeset/4567 new files from upstream git A trunk/thirdparty/cxml/.git/objects/24/ A trunk/thirdparty/cxml/.git/objects/24/47757e7176fa22b2fb50ac7c79085bcdceff4a A trunk/thirdparty/cxml/.git/objects/3a/fda4dd993a85fed513cb18522b0595d2bb2229 A trunk/thirdparty/cxml/.git/objects/40/a190e17b07be366f9664c2a49958be72399a89 A trunk/thirdparty/cxml/.git/objects/76/ A trunk/thirdparty/cxml/.git/objects/76/49cb9b4f48948848a4af2ac758e48bcd13dc90 A trunk/thirdparty/cxml/.git/objects/7f/ A trunk/thirdparty/cxml/.git/objects/7f/4ed3cd4152206d8e5855d8baa933a1d931636c A trunk/thirdparty/cxml/.git/objects/a1/6cbfb184a0b6f47bae93699300b3107ca3fe20 A trunk/thirdparty/cxml/.git/objects/b4/ A trunk/thirdparty/cxml/.git/objects/b4/18e2cbb16fc9ef7b63cb37f4d0db7708daf7db A trunk/thirdparty/cxml/.git/objects/cb/ A trunk/thirdparty/cxml/.git/objects/cb/22d0bfc44af2b20fc392625f69c42eb828c6a7 A trunk/thirdparty/cxml/.git/objects/ed/ A trunk/thirdparty/cxml/.git/objects/ed/bbcb15f9a441d73b6c1b1b42f7e7a4b7aa08b5 A trunk/thirdparty/cxml/.git/objects/fa/ A trunk/thirdparty/cxml/.git/objects/fa/834ffef4de73c73d8568c8df0a1f18b130ac70 Added: trunk/thirdparty/cxml/.git/objects/24/47757e7176fa22b2fb50ac7c79085bcdceff4a =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/24/47757e7176fa22b2fb50ac7c79085bcdceff4a ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/3a/fda4dd993a85fed513cb18522b0595d2bb2229 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/3a/fda4dd993a85fed513cb18522b0595d2bb2229 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/40/a190e17b07be366f9664c2a49958be72399a89 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/40/a190e17b07be366f9664c2a49958be72399a89 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/76/49cb9b4f48948848a4af2ac758e48bcd13dc90 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/76/49cb9b4f48948848a4af2ac758e48bcd13dc90 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/7f/4ed3cd4152206d8e5855d8baa933a1d931636c =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/7f/4ed3cd4152206d8e5855d8baa933a1d931636c ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/a1/6cbfb184a0b6f47bae93699300b3107ca3fe20 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/a1/6cbfb184a0b6f47bae93699300b3107ca3fe20 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/b4/18e2cbb16fc9ef7b63cb37f4d0db7708daf7db =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/b4/18e2cbb16fc9ef7b63cb37f4d0db7708daf7db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/cb/22d0bfc44af2b20fc392625f69c42eb828c6a7 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/cb/22d0bfc44af2b20fc392625f69c42eb828c6a7 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/ed/bbcb15f9a441d73b6c1b1b42f7e7a4b7aa08b5 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/ed/bbcb15f9a441d73b6c1b1b42f7e7a4b7aa08b5 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/thirdparty/cxml/.git/objects/fa/834ffef4de73c73d8568c8df0a1f18b130ac70 =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/cxml/.git/objects/fa/834ffef4de73c73d8568c8df0a1f18b130ac70 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[bknr-cvs] hans changed trunk/thirdparty/cxml/
by BKNR Commits 09 Jul '10

09 Jul '10

Revision: 4566 Author: hans URL: http://bknr.net/trac/changeset/4566 pull from upstream git U trunk/thirdparty/cxml/.git/FETCH_HEAD U trunk/thirdparty/cxml/.git/ORIG_HEAD U trunk/thirdparty/cxml/.git/index U trunk/thirdparty/cxml/.git/logs/HEAD U trunk/thirdparty/cxml/.git/logs/refs/heads/master U trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master U trunk/thirdparty/cxml/.git/refs/heads/master U trunk/thirdparty/cxml/.git/refs/remotes/origin/master U trunk/thirdparty/cxml/cxml.asd U trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp Modified: trunk/thirdparty/cxml/.git/FETCH_HEAD =================================================================== --- trunk/thirdparty/cxml/.git/FETCH_HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/FETCH_HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,3 @@ 944c177ddfff2ec18666bffbe918bb6632d36863 not-for-merge branch 'dlichteblau' of git://repo.or.cz/cxml -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 branch 'master' of git://repo.or.cz/cxml +7f4ed3cd4152206d8e5855d8baa933a1d931636c branch 'master' of git://repo.or.cz/cxml 6a4a3be00fb65bed9eb5754f3ca747e96bc6a466 not-for-merge branch 'origin' of git://repo.or.cz/cxml Modified: trunk/thirdparty/cxml/.git/ORIG_HEAD =================================================================== --- trunk/thirdparty/cxml/.git/ORIG_HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/ORIG_HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -a1a95a4d03701050f71044fd9305d50cd6480c98 +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Modified: trunk/thirdparty/cxml/.git/index =================================================================== (Binary files differ) Modified: trunk/thirdparty/cxml/.git/logs/HEAD =================================================================== --- trunk/thirdparty/cxml/.git/logs/HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner <hans(a)hertha.local> 1210160156 +0200 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner <hans(a)jasmin.headcraft.de> 1214327116 +0000 pull : Fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner <hans(a)hertha.local> 1238849599 +0200 pull : Fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner <hans.huebner(a)gmail.com> 1278671001 +0000 pull : Fast-forward Modified: trunk/thirdparty/cxml/.git/logs/refs/heads/master =================================================================== --- trunk/thirdparty/cxml/.git/logs/refs/heads/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/refs/heads/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner <hans(a)hertha.local> 1210160156 +0200 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner <hans(a)jasmin.headcraft.de> 1214327116 +0000 pull : Fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner <hans(a)hertha.local> 1238849599 +0200 pull : Fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner <hans.huebner(a)gmail.com> 1278671001 +0000 pull : Fast-forward Modified: trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner <hans(a)hertha.local> 1210160155 +0200 clone: from git://repo.or.cz/cxml.git 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner <hans(a)jasmin.headcraft.de> 1214327096 +0000 pull : fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner <hans(a)hertha.local> 1238849598 +0200 pull : fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner <hans.huebner(a)gmail.com> 1278671001 +0000 pull : fast-forward Modified: trunk/thirdparty/cxml/.git/refs/heads/master =================================================================== --- trunk/thirdparty/cxml/.git/refs/heads/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/refs/heads/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 +7f4ed3cd4152206d8e5855d8baa933a1d931636c Modified: trunk/thirdparty/cxml/.git/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml/.git/refs/remotes/origin/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/refs/remotes/origin/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 +7f4ed3cd4152206d8e5855d8baa933a1d931636c Modified: trunk/thirdparty/cxml/cxml.asd =================================================================== --- trunk/thirdparty/cxml/cxml.asd 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/cxml.asd 2010-07-09 09:43:49 UTC (rev 4566) @@ -7,13 +7,31 @@ (defmethod asdf:component-name ((c dummy-cxml-component)) :cxml) -;; force loading of closure-common.asd, which installs *FEATURES* this -;; file depends on. Use MISSING-DEPENDENCY for asdf-install. -(unless (find-system :closure-common nil) - (error 'missing-dependency - :required-by (make-instance 'dummy-cxml-component) - :version nil - :requires :closure-common)) +(progn + (format t "~&;;; Checking for wide character support...") + (force-output) + (flet ((test (code) + (and (< code char-code-limit) (code-char code)))) + (cond + ((not (test 50000)) + (format t " no, reverting to octet strings.~%") + #+rune-is-character + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-integer *features*)) + ((code-char 70000) + (when (test #xD800) + (format t " WARNING: Lisp implementation doesn't use UTF-16, ~ + but accepts surrogate code points.~%")) + (format t " yes, using code points.~%") + #+(or rune-is-integer rune-is-utf-16) + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-character *features*)) + (t + (format t " yes, using UTF-16.~%") + #+(or rune-is-integer (and rune-is-character (not rune-is-utf-16))) + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-utf-16 *features*) + (pushnew :rune-is-character *features*))))) (defclass closure-source-file (cl-source-file) ()) @@ -29,9 +47,10 @@ (asdf:defsystem :cxml-xml :default-component-class closure-source-file - :pathname (merge-pathnames - "xml/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "xml/" + #-asdf2 (merge-pathnames + "xml/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file "util" :depends-on ("package")) @@ -74,9 +93,10 @@ (asdf:defsystem :cxml-dom :default-component-class closure-source-file - :pathname (merge-pathnames - "dom/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "dom/" + #-asdf2 (merge-pathnames + "dom/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file rune-impl :pathname "dom-impl" :depends-on ("package")) @@ -90,9 +110,10 @@ (asdf:defsystem :cxml-klacks :default-component-class closure-source-file - :pathname (merge-pathnames - "klacks/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "klacks/" + #-asdf2 (merge-pathnames + "klacks/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :serial t :components ((:file "package") @@ -103,9 +124,10 @@ (asdf:defsystem :cxml-test :default-component-class closure-source-file - :pathname (merge-pathnames - "test/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "test/" + #-asdf2 (merge-pathnames + "test/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "domtest") (:file "xmlconf")) :depends-on (:cxml-xml :cxml-klacks :cxml-dom)) Modified: trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp =================================================================== --- trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp 2010-07-09 09:43:49 UTC (rev 4566) @@ -137,6 +137,5 @@ (sax:start-element (proxy-chained-handler handler) uri lname qname attrs)) (defmethod sax:end-element ((handler namespace-normalizer) uri lname qname) - (declare (ignore qname)) (pop (xmlns-stack handler)) (sax:end-element (proxy-chained-handler handler) (or uri #"") lname qname))

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/images/imageproc-handler.lisp
by BKNR Commits 05 Jul '10

05 Jul '10

Revision: 4565 Author: hans URL: http://bknr.net/trac/changeset/4565 fix for current alexandria API U trunk/bknr/web/src/images/imageproc-handler.lisp Modified: trunk/bknr/web/src/images/imageproc-handler.lisp =================================================================== --- trunk/bknr/web/src/images/imageproc-handler.lisp 2010-07-04 20:34:21 UTC (rev 4564) +++ trunk/bknr/web/src/images/imageproc-handler.lisp 2010-07-05 09:21:40 UTC (rev 4565) @@ -179,5 +179,5 @@ (with-http-response (:content-type (image-content-type (image-type-keyword image))) (setf (header-out :content-length) (blob-size image)) (with-open-file (blob-data (blob-pathname image) :element-type '(unsigned-byte 8)) - (copy-stream blob-data (send-headers) '(unsigned-byte 8))))))) + (copy-stream blob-data (send-headers) :element-type '(unsigned-byte 8)))))))

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/init.lisp
by BKNR Commits 04 Jul '10

04 Jul '10

Revision: 4564 Author: hans URL: http://bknr.net/trac/changeset/4564 this is how the taskmaster needs to be passed U trunk/projects/quickhoney/src/init.lisp Modified: trunk/projects/quickhoney/src/init.lisp =================================================================== --- trunk/projects/quickhoney/src/init.lisp 2010-07-04 20:32:45 UTC (rev 4563) +++ trunk/projects/quickhoney/src/init.lisp 2010-07-04 20:34:21 UTC (rev 4564) @@ -40,7 +40,7 @@ ((start-fn () (hunchentoot:start (make-instance 'hunchentoot:acceptor :port port - :taskmaster 'hunchentoot:single-threaded-taskmaster + :taskmaster (make-instance 'hunchentoot:single-threaded-taskmaster) :request-dispatcher 'bknr.web:bknr-dispatch :persistent-connections-p nil)))) (if foregroundp

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/
by BKNR Commits 04 Jul '10

04 Jul '10

Revision: 4563 Author: hans URL: http://bknr.net/trac/changeset/4563 adapt to new hunchentoot U trunk/projects/quickhoney/src/handlers.lisp U trunk/projects/quickhoney/src/init.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2010-06-14 07:56:22 UTC (rev 4562) +++ trunk/projects/quickhoney/src/handlers.lisp 2010-07-04 20:32:45 UTC (rev 4563) @@ -597,5 +597,5 @@ ()) (defmethod handle ((handler shutdown-handler)) - (hunchentoot:stop-server hunchentoot:*server*) + (hunchentoot:stop hunchentoot:*acceptor*) "Shutting down HTTP server") Modified: trunk/projects/quickhoney/src/init.lisp =================================================================== --- trunk/projects/quickhoney/src/init.lisp 2010-06-14 07:56:22 UTC (rev 4562) +++ trunk/projects/quickhoney/src/init.lisp 2010-07-04 20:32:45 UTC (rev 4563) @@ -6,7 +6,7 @@ #+openmcl (ccl:save-application "quickhoney" :prepend-kernel t)) -(defun startup () +(defun startup (&key foregroundp (port *webserver-port*)) (cond (*dumped-image* (asdf:oos 'asdf:load-op :quickhoney) @@ -36,8 +36,14 @@ (format t "; loading site configuration file~%") (let ((*package* (find-package :quickhoney.config))) (load "site-config.lisp"))) - (bt:make-thread (curry #'hunchentoot:start-server - :port *webserver-port* - :threaded nil - :persistent-connections-p nil) - :name (format nil "HTTP server on port ~A" *webserver-port*))) + (flet + ((start-fn () + (hunchentoot:start (make-instance 'hunchentoot:acceptor + :port port + :taskmaster 'hunchentoot:single-threaded-taskmaster + :request-dispatcher 'bknr.web:bknr-dispatch + :persistent-connections-p nil)))) + (if foregroundp + (funcall #'start-fn) + (bt:make-thread #'start-fn + :name (format nil "HTTP server on port ~A" *webserver-port*)))))

1 0