svn commit: r471385 - in /httpd/mod_python/trunk: lib/python/mod_python/__init__.py src/include/mpversion.h src/requestobject.c test/htdocs/tests.py

[gr...@apache.org]

Author: grahamd
Date: Sun Nov  5 01:28:42 2006
New Revision: 471385

URL: http://svn.apache.org/viewvc?view=rev&rev=471385
Log:
(MODPYTHON-125) When assigning to req.handler, should allow it to be set
to None to reset it.


Modified:
    httpd/mod_python/trunk/lib/python/mod_python/__init__.py
    httpd/mod_python/trunk/src/include/mpversion.h
    httpd/mod_python/trunk/src/requestobject.c
    httpd/mod_python/trunk/test/htdocs/tests.py

Modified: httpd/mod_python/trunk/lib/python/mod_python/__init__.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/lib/python/mod_python/__init__.py?view=diff&rev=471385&r1=471384&r2=471385
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Sun Nov  5 01:28:42 2006
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util", "python22"]
 
-version = "3.3.0-dev-20061104"
+version = "3.3.0-dev-20061105"
 

Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/include/mpversion.h?view=diff&rev=471385&r1=471384&r2=471385
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sun Nov  5 01:28:42 2006
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 3
 #define MPV_PATCH 0
-#define MPV_BUILD 20061104
-#define MPV_STRING "3.3.0-dev-20061104"
+#define MPV_BUILD 20061105
+#define MPV_STRING "3.3.0-dev-20061105"

Modified: httpd/mod_python/trunk/src/requestobject.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/requestobject.c?view=diff&rev=471385&r1=471384&r2=471385
==============================================================================
--- httpd/mod_python/trunk/src/requestobject.c (original)
+++ httpd/mod_python/trunk/src/requestobject.c Sun Nov  5 01:28:42 2006
@@ -1681,6 +1681,10 @@
         return 0;
     }
     else if (strcmp(name, "handler") == 0) {
+        if (val == Py_None) {
+            self->request_rec->handler = 0;
+            return 0;
+        }
         if (! PyString_Check(val)) {
             PyErr_SetString(PyExc_TypeError, "handler must be a string");
             return -1;

Modified: httpd/mod_python/trunk/test/htdocs/tests.py
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/test/htdocs/tests.py?view=diff&rev=471385&r1=471384&r2=471385
==============================================================================
--- httpd/mod_python/trunk/test/htdocs/tests.py (original)
+++ httpd/mod_python/trunk/test/htdocs/tests.py Sun Nov  5 01:28:42 2006
@@ -875,6 +875,8 @@
 def req_handler(req):
     if req.phase == "PythonFixupHandler":
         req.handler = "mod_python"
+        req.handler = None
+        req.handler = "mod_python"
         req.add_handler("PythonHandler","tests::req_handler")
         return apache.OK
     elif req.phase == "PythonHandler":