cvs: php-src(PHP_4_3) /sapi/apache2handler sapi_apache2.c

moriyoshi Tue Jul 20 16:48:02 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/sapi/apache2handler sapi_apache2.c Log: - MFH (sapi_apache2.c: 1.41): request_dtor() should be called if a fatal error occurs during activation phase. # 4.3.8 patches need to be committed to this branch, otherwise... http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.32&r2=1.1.2.33&ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.32 php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.33 --- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.32 Fri Jun 25 08:51:38 2004 +++ php-src/sapi/apache2handler/sapi_apache2.c Tue Jul 20 16:48:01 2004 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.1.2.32 2004/06/25 12:51:38 edink Exp $ */ +/* $Id: sapi_apache2.c,v 1.1.2.33 2004/07/20 20:48:01 moriyoshi Exp $ */ #include <fcntl.h> @@ -552,6 +552,8 @@ #endif } +} zend_end_try(); + if (!parent_req) { php_apache_request_dtor(r TSRMLS_CC); ctx->request_processed = 1; @@ -566,8 +568,6 @@ } else { ctx->r = parent_req; } - -} zend_end_try(); return OK; }