summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham.Dumpleton <devnull@localhost>2007-06-29 00:11:27 +0000
committerGraham.Dumpleton <devnull@localhost>2007-06-29 00:11:27 +0000
commit0ab37f015434ce95457a582c953e2e27772d9f4c (patch)
tree2322ca435b5b89f8054611345901bd914a76d0aa
parentb50f801a0e8dedc2c1acaff4a6e460bdfa26dc59 (diff)
downloadmod_wsgi-0ab37f015434ce95457a582c953e2e27772d9f4c.tar.gz
Don't perform restart of Python in main Apache process as Python leaks too
much memory on such a restart and child process would inherit the memory leak.
-rw-r--r--mod_wsgi.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/mod_wsgi.c b/mod_wsgi.c
index 6f934f4..6d4c04c 100644
--- a/mod_wsgi.c
+++ b/mod_wsgi.c
@@ -3083,6 +3083,15 @@ static void wsgi_python_init(apr_pool_t *p)
PyThreadState_Swap(NULL);
+ /*
+ * XXX Python leaks too much memory when it is
+ * terminated and the restarted in the same process, so
+ * don't do this in the parent process for the time
+ * being. Everything should still work okay as never did
+ * this for Apache 1.3 anyway.
+ */
+
+#if 0
#if AP_SERVER_MAJORVERSION_NUMBER >= 2
/*
* Trigger destruction of the Python interpreter in the
@@ -3096,6 +3105,7 @@ static void wsgi_python_init(apr_pool_t *p)
apr_pool_cleanup_register(wsgi_server_pool, NULL, wsgi_python_term,
apr_pool_cleanup_null);
#endif
+#endif
wsgi_python_initialized = 1;
}