svn commit: r359740 - in /httpd/mod_python/trunk: lib/python/mod_python/apache.py src/include/mpversion.h

[nl...@apache.org]

Author: nlehuen
Date: Wed Dec 28 22:51:49 2005
New Revision: 359740

URL: http://svn.apache.org/viewcvs?rev=359740&view=rev
Log:
Cache the main callback as Graham suggested in http://www.mail-archive.com/python-dev@httpd.apache.org/msg00904.html

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

Modified: httpd/mod_python/trunk/lib/python/mod_python/apache.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/apache.py?rev=359740&r1=359739&r2=359740&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/apache.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/apache.py Wed Dec 28 22:51:49 2005
@@ -737,6 +737,7 @@
 
 _interpreter = None
 _server = None
+_callback = None
 
 def register_cleanup(handler,data=None):
     _apache.register_cleanup(_interpreter,_server,handler,data)
@@ -752,8 +753,10 @@
     _server = server
 
     sys.argv = ["mod_python"]
-    
-    return CallBack()
+
+    global _callback
+    _callback = CallBack()
+    return _callback
 
 ## Some functions made public
 make_table = _apache.table

Modified: httpd/mod_python/trunk/src/include/mpversion.h
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/src/include/mpversion.h?rev=359740&r1=359739&r2=359740&view=diff
==============================================================================
--- httpd/mod_python/trunk/src/include/mpversion.h (original)
+++ httpd/mod_python/trunk/src/include/mpversion.h Wed Dec 28 22:51:49 2005
@@ -1,5 +1,5 @@
 #define MPV_MAJOR 3
 #define MPV_MINOR 2
 #define MPV_PATCH 6
-#define MPV_BUILD 20051217
-#define MPV_STRING "3.2.6-dev-20051217"
+#define MPV_BUILD 20051229
+#define MPV_STRING "3.2.6-dev-20051229"