- release 52 (by relup.sh)

[packages/apache-mod_python.git] / import.patch

diff --git a/import.patch b/import.patch
index defaa88190f0d34ff3c8dd7211409dd09c9304a6..71456f38ff00a7df7fba1843f96801fc45485204 100644 (file)
--- a/import.patch
+++ b/import.patch
@@ -1,16 +1,9 @@
-commit 5bb5d6d0113f6bbd72966a5c1f3e6d40c2e9c8fd
-Author: Grisha Trubetskoy <grisha@modpython.org>
-Date:   Tue Dec 1 22:07:50 2015 -0500
-
-    Do not import site.py for the main interpreter. Fixes #46.
-
-diff --git a/src/mod_python.c b/src/mod_python.c
-index 8c33c04..7e0ef1e 100644
---- a/src/mod_python.c
-+++ b/src/mod_python.c
-@@ -775,8 +775,15 @@ static int python_init(apr_pool_t *p, apr_pool_t *ptemp,
-         /* disable user site directories */
-         Py_NoUserSiteDirectory = 1;
+diff -urNp -x '*.orig' mod_python-3.5.0.org/src/mod_python.c mod_python-3.5.0/src/mod_python.c
+--- mod_python-3.5.0.org/src/mod_python.c      2013-11-12 04:21:34.000000000 +0100
++++ mod_python-3.5.0/src/mod_python.c  2021-03-02 22:05:35.833364242 +0100
+@@ -772,8 +772,15 @@ static int python_init(apr_pool_t *p, ap
+     {
+         initialized = 1;

  
 -        /* initialze the interpreter */
 +        /* Initialze the main interpreter. We do not want site.py to
  
 -        /* initialze the interpreter */
 +        /* Initialze the main interpreter. We do not want site.py to


@@ -25,7 +18,7 @@ index 8c33c04..7e0ef1e 100644
  
  #ifdef WITH_THREAD
          /* create and acquire the interpreter lock */
  
  #ifdef WITH_THREAD
          /* create and acquire the interpreter lock */

-@@ -2649,7 +2656,7 @@ static void PythonChildInitHandler(apr_pool_t *p, server_rec *s)
+@@ -2646,7 +2653,7 @@ static void PythonChildInitHandler(apr_p

       * problems as well. Thus disable cleanup of Python when
       * child processes are being shutdown. (MODPYTHON-109)
       *
       * problems as well. Thus disable cleanup of Python when
       * child processes are being shutdown. (MODPYTHON-109)
       *