[bknr-cvs] edi changed trunk/thirdparty/hunchentoot/

[BKNR Commits]

Revision: 4488
Author: edi
URL: http://bknr.net/trac/changeset/4488

Get rid of *within-request-p*

U   trunk/thirdparty/hunchentoot/doc/index.xml
U   trunk/thirdparty/hunchentoot/packages.lisp
U   trunk/thirdparty/hunchentoot/request.lisp
U   trunk/thirdparty/hunchentoot/specials.lisp

Modified: trunk/thirdparty/hunchentoot/doc/index.xml
===================================================================
--- trunk/thirdparty/hunchentoot/doc/index.xml	2009-12-14 20:26:57 UTC (rev 4487)
+++ trunk/thirdparty/hunchentoot/doc/index.xml	2009-12-22 22:14:35 UTC (rev 4488)
@@ -953,7 +953,7 @@
             a <a href="http://www.lispworks.com/documentation/HyperSpec/Body/26_glo_f.htm#function_designator">function
               designator</a> for a unary function.  In this case, the
             handler will be returned
-            by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref> ,
+            by <clix:ref>DISPATCH-EASY-HANDLERS</clix:ref>,
             if <clix:arg>uri</clix:arg> is a string and
             the <a href="#script-name">script name</a> of the current
             request is <clix:arg>uri</clix:arg>, or
@@ -2897,7 +2897,6 @@
     </clix:description>
   </clix:function>
 
-      <clix:special-variable name="*tmp-directory*">
   <clix:function name='within-request-p'>
   <clix:lambda-list>
   </clix:lambda-list>
@@ -2907,6 +2906,7 @@
     </clix:description>
   </clix:function>
 
+      <clix:special-variable name="*tmp-directory*">
         <clix:description>
           This should be a pathname denoting a directory where temporary
           files can be stored. It is used for <a href="#upload">file

Modified: trunk/thirdparty/hunchentoot/packages.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/packages.lisp	2009-12-14 20:26:57 UTC (rev 4487)
+++ trunk/thirdparty/hunchentoot/packages.lisp	2009-12-22 22:14:35 UTC (rev 4488)
@@ -64,7 +64,6 @@
            "*METHODS-FOR-POST-PARAMETERS*"
            "*REPLY*"
            "*REQUEST*"
-           "WITHIN-REQUEST-P"
            "*REWRITE-FOR-SESSION-URLS*"
            "*SESSION*"
            "*SESSION-GC-FREQUENCY*"

Modified: trunk/thirdparty/hunchentoot/request.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/request.lisp	2009-12-14 20:26:57 UTC (rev 4487)
+++ trunk/thirdparty/hunchentoot/request.lisp	2009-12-22 22:14:35 UTC (rev 4488)
@@ -224,8 +224,7 @@
   (let (*tmp-files* *headers-sent*)
     (unwind-protect
         (with-mapped-conditions ()
-          (let* ((*request* request)
-                 (*within-request-p* t))
+          (let* ((*request* request))
             (multiple-value-bind (body error)
                 (catch 'handler-done
                   (invoke-process-request-with-error-handling
@@ -253,7 +252,7 @@
 
 (defun within-request-p ()
   "True if we're in the context of a request, otherwise nil."
-  *within-request-p*)
+  (and (boundp '*request*) *request*))
 
 (defun parse-multipart-form-data (request external-format)
   "Parse the REQUEST body as multipart/form-data, assuming that its

Modified: trunk/thirdparty/hunchentoot/specials.lisp
===================================================================
--- trunk/thirdparty/hunchentoot/specials.lisp	2009-12-14 20:26:57 UTC (rev 4487)
+++ trunk/thirdparty/hunchentoot/specials.lisp	2009-12-22 22:14:35 UTC (rev 4488)
@@ -234,11 +234,6 @@
 (defvar-unbound *request*
   "The current REQUEST object while in the context of a request.")
 
-(defvar *within-request-p* nil
-  "True while in the context of a request (while *request* is bound),
-otherwise nil.  Outside callers should use exported function
-within-request-p to test this.")
-
 (defvar-unbound *reply*
   "The current REPLY object while in the context of a request.")