You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_python-commits@quetz.apache.org by gr...@apache.org on 2006/10/02 08:06:48 UTC
svn commit: r451886 - in /httpd/mod_python/trunk/src: mod_python.c
requestobject.c
Author: grahamd
Date: Sun Oct 1 23:06:47 2006
New Revision: 451886
URL: http://svn.apache.org/viewvc?view=rev&rev=451886
Log:
Thread locks not being released when fatal error condition occurs. Remove
duplicate method listing.
Modified:
httpd/mod_python/trunk/src/mod_python.c
httpd/mod_python/trunk/src/requestobject.c
Modified: httpd/mod_python/trunk/src/mod_python.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/mod_python.c?view=diff&rev=451886&r1=451885&r2=451886
==============================================================================
--- httpd/mod_python/trunk/src/mod_python.c (original)
+++ httpd/mod_python/trunk/src/mod_python.c Sun Oct 1 23:06:47 2006
@@ -243,6 +243,12 @@
if (!interpreters) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, main_server,
"get_interpreter: interpreters dictionary not initialised.");
+#ifdef WITH_THREAD
+ PyEval_ReleaseLock();
+#endif
+#if APR_HAS_THREADS
+ apr_thread_mutex_unlock(interpreters_lock);
+#endif
return NULL;
}
Modified: httpd/mod_python/trunk/src/requestobject.c
URL: http://svn.apache.org/viewvc/httpd/mod_python/trunk/src/requestobject.c?view=diff&rev=451886&r1=451885&r2=451886
==============================================================================
--- httpd/mod_python/trunk/src/requestobject.c (original)
+++ httpd/mod_python/trunk/src/requestobject.c Sun Oct 1 23:06:47 2006
@@ -1561,7 +1561,6 @@
{"get_remote_host", (PyCFunction) req_get_remote_host, METH_VARARGS},
{"get_options", (PyCFunction) req_get_options, METH_NOARGS},
{"get_session", (PyCFunction) req_get_session, METH_VARARGS},
- {"write", (PyCFunction) req_write, METH_VARARGS},
{"internal_redirect", (PyCFunction) req_internal_redirect, METH_VARARGS},
{"is_https", (PyCFunction) req_is_https, METH_NOARGS},
{"log_error", (PyCFunction) req_log_error, METH_VARARGS},