Attachment 165267 Details for Bug 204793 – Do not import site.py patch

[patch] Do not import site.py patch

mod_python535-20151209.patch (text/plain), 1.06 KB, created by SBB on 2016-01-08 15:24:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: SBB

Created: 2016-01-08 15:24:35 UTC

Size: 1.06 KB

patch

obsolete

>--- ./src/mod_python.c.orig   2015-12-09 21:54:25.823489839 +0000
>+++ ./src/mod_python.c        2015-12-09 21:55:31.326483792 +0000
>@@ -772,8 +772,15 @@
>     {
>         initialized = 1;
> 
>-        /* initialze the interpreter */
>+        /* Initialze the main interpreter. We do not want site.py to
>+         * be imported because as of Python 2.7.9 it would cause a
>+         * circular dependency related to _locale which breaks
>+         * graceful restart so we set Py_NoSiteFlag to 1 just for this
>+         * one time. (https://github.com/grisha/mod_python/issues/46)
>+         */
>+        Py_NoSiteFlag = 1;
>         Py_Initialize();
>+        Py_NoSiteFlag = 0;
> 
> #ifdef WITH_THREAD
>         /* create and acquire the interpreter lock */
>@@ -2646,7 +2653,7 @@
>      * problems as well. Thus disable cleanup of Python when
>      * child processes are being shutdown. (MODPYTHON-109)
>      *
>-    apr_pool_cleanup_register(p, NULL, python_finalize, apr_pool_cleanup_null);
>+     * apr_pool_cleanup_register(p, NULL, python_finalize, apr_pool_cleanup_null);
>      */
> 
>     /*

Actions: View | Diff

Attachments on bug 204793: 165267 | 165638