Changes between Version 20 and Version 21 of TracModPython

Timestamp:

Mar 16, 2005, 8:52:58 PM (19 years ago)

Author:

jkp@…

Comment:

Added OS X patch

TracModPython

@@ -183 +183 @@
 or apply [http://www.dscpl.com.au/projects/vampire/PATCHES this patch] to mod_python.
 
-Also note another potential issue where Apache will return a 500 error regardless of what you try to do with mod_python.  If you see this, make sure you do not restart using apachectl restart, but instead stop and start the server again.   This solves the issue.
+Also note that there is an error in the module when you build it from source.  Basically an unpatched version will not respond correctly to the 'apachectl restart' command.  If you issue this command on an unpatched module your client will receive a 500 error from apache.  The patch needed to fix this problem is included below:
+
+{{{
+*** mod_python.c.dist   Tue May 29 06:00:41 2001
+--- mod_python.c        Thu Aug  5 13:21:22 2004
+***************
+*** 260,265 ****
+--- 260,268 ----
+
+      char buff[255];
+
++     /* fudge for Mac OS X with Apache where Py_IsInitialized() broke */
++     static int initialized = 0;
++
+      /* pool given to us in ChildInit. We use it for
+         server.register_cleanup() */
+      pool *child_init_pool = NULL;
+***************
+*** 272,279 ****
+      ap_add_version_component(buff);
+
+      /* initialize global Python interpreter if necessary */
+!     if (! Py_IsInitialized())
+      {
+
+        /* initialze the interpreter */
+        Py_Initialize();
+--- 275,283 ----
+      ap_add_version_component(buff);
+
+      /* initialize global Python interpreter if necessary */
+!     if (initialized == 0 || ! Py_IsInitialized())
+      {
++         initialized = 1;
+
+        /* initialze the interpreter */
+        Py_Initialize();
+}}}
 
 ----