scottmac                Sun Jun  1 16:08:53 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/sapi/apache        mod_php5.c 
  Log:
  Fixed bug #45144 (ap_child_terminate() isn't available on threaded builds)
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7.2.13.2.5&r2=1.19.2.7.2.13.2.6&diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.5 
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.6
--- php-src/sapi/apache/mod_php5.c:1.19.2.7.2.13.2.5    Tue Mar 18 21:42:50 2008
+++ php-src/sapi/apache/mod_php5.c      Sun Jun  1 16:08:52 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.5 2008/03/18 21:42:50 rasmus Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.13.2.6 2008/06/01 16:08:52 scottmac Exp $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
@@ -438,7 +438,9 @@
  */
 static void sapi_apache_child_terminate(TSRMLS_D)
 {
+#ifndef MULTITHREAD
        ap_child_terminate((request_rec *)SG(server_context));
+#endif
 }
 /* }}} */
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to