cvs: php-src /sapi/apache mod_php.c
| From: | Scott MacVicar | Date: | Sun, 01 Jun 2008 16:10:46 +0000 |
| Subject: | cvs: php-src /sapi/apache mod_php.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50227@lists.php.net to get a copy of this message | ||
scottmac Sun Jun 1 16:10:46 2008 UTC
Modified files:
/php-src/sapi/apache mod_php.c
Log:
MFB: Fixed bug #45144 (ap_child_terminate() isn't available on threaded builds)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php.c?r1=1.7&r2=1.8&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.7 php-src/sapi/apache/mod_php.c:1.8
--- php-src/sapi/apache/mod_php.c:1.7 Wed Mar 19 16:37:48 2008
+++ php-src/sapi/apache/mod_php.c Sun Jun 1 16:10:46 2008
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php.c,v 1.7 2008/03/19 16:37:48 rasmus Exp $ */
+/* $Id: mod_php.c,v 1.8 2008/06/01 16:10:46 scottmac Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -435,7 +435,9 @@
*/
static void sapi_apache_child_terminate(TSRMLS_D)
{
+#ifndef MULTITHREAD
ap_child_terminate((request_rec *)SG(server_context));
+#endif
}
/* }}} */