svn commit: r396368 - in /httpd/mod_python/trunk: lib/python/mod_python/__init__.py lib/python/mod_python/importer.py src/include/mpversion.h

[gr...@apache.org]

Author: grahamd
Date: Sun Apr 23 18:24:20 2006
New Revision: 396368

URL: http://svn.apache.org/viewcvs?rev=396368&view=rev
Log:
When fix for MODPYTHON-134 was made resulting in boolean mod_python config
values now being present as "0" value entry, rather than being absent, the
check in new module importer for PythonEnablePdb wasn't updated to match
the new scheme. Thus, setting PythonEnablePdb to Off would actually result
in it being enabled when it shouldn't have been.


Modified:
    httpd/mod_python/trunk/lib/python/mod_python/__init__.py
    httpd/mod_python/trunk/lib/python/mod_python/importer.py
    httpd/mod_python/trunk/src/include/mpversion.h

Modified: httpd/mod_python/trunk/lib/python/mod_python/__init__.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/__init__.py?rev=396368&r1=396367&r2=396368&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Sun Apr 23 18:24:20 2006
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util", "python22"]
 
-version = "3.3.0-dev-20060423"
+version = "3.3.0-dev-20060424"
 

Modified: httpd/mod_python/trunk/lib/python/mod_python/importer.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/importer.py?rev=396368&r1=396367&r2=396368&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/importer.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/importer.py Sun Apr 23 18:24:20 2006
@@ -951,7 +951,7 @@
         # Only permit debugging using pdb if Apache has
         # actually been started in single process mode.
 
-        pdb_debug = config.has_key("PythonEnablePdb")
+        pdb_debug = int(config.get("PythonEnablePdb", "0"))
         one_process = apache.exists_config_define("ONE_PROCESS")
 
         if pdb_debug and one_process:

Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=396368&r1=396367&r2=396368&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Sun Apr 23 18:24:20 2006
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 3
 #define MPV_PATCH 0
-#define MPV_BUILD 20060423
-#define MPV_STRING "3.3.0-dev-20060423"
+#define MPV_BUILD 20060424
+#define MPV_STRING "3.3.0-dev-20060424"