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

[gr...@apache.org]

Author: grahamd
Date: Thu Nov  2 21:09:16 2006
New Revision: 470673

URL: http://svn.apache.org/viewvc?view=rev&rev=470673
Log:
The request object add_handler() function should allow None to be supplied
as the optional path argument and have it be interpreted as if the argument
was never supplied in the first place.


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

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=470673&r1=470672&r2=470673
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Thu Nov  2 21:09:16 2006
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util", "python22"]
 
-version = "3.3.0-dev-20061030"
+version = "3.3.0-dev-20061103"
 

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=470673&r1=470672&r2=470673
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Thu Nov  2 21:09:16 2006
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 3
 #define MPV_PATCH 0
-#define MPV_BUILD 20061030
-#define MPV_STRING "3.3.0-dev-20061030"
+#define MPV_BUILD 20061103
+#define MPV_STRING "3.3.0-dev-20061103"

Modified: httpd/mod_python/trunk/src/requestobject.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/requestobject.c?view=diff&rev=470673&r1=470672&r2=470673
==============================================================================
--- httpd/mod_python/trunk/src/requestobject.c (original)
+++ httpd/mod_python/trunk/src/requestobject.c Thu Nov  2 21:09:16 2006
@@ -144,9 +144,9 @@
     const char *dir = NULL;
     const char *currphase;
 
-    if (! PyArg_ParseTuple(args, "ss|s", &phase, &handler, &dir)) {
+    if (! PyArg_ParseTuple(args, "ss|z", &phase, &handler, &dir)) {
         PyErr_Clear();
-        if (! PyArg_ParseTuple(args, "sO|s", &phase, &callable, &dir)) {
+        if (! PyArg_ParseTuple(args, "sO|z", &phase, &callable, &dir)) {
             PyErr_SetString(PyExc_ValueError, 
                             "handler must be a string or callable object");
             return NULL;