Re: cvs: php-src /sapi/apache2handler sapi_apache2.c

By all means, go ahead. Ilia On July 20, 2004 04:13 pm, Moriyoshi Koizumi wrote: > I'm going to merge this patch to 4.3 branch if there's no problem. > > Moriyoshi > > On 2004/07/18, at 6:29, Moriyoshi Koizumi wrote: > > moriyoshi Sat Jul 17 17:29:52 2004 EDT > > > > Modified files: > > /php-src/sapi/apache2handler sapi_apache2.c > > Log: > > - request_dtor() should be called if a fatal error occurs during > > activation > > phase. > > > > > > http://cvs.php.net/diff.php/php-src/sapi/apache2handler/ > > sapi_apache2.c?r1=1.40&r2=1.41&ty=u > > Index: php-src/sapi/apache2handler/sapi_apache2.c > > diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40 > > php-src/sapi/apache2handler/sapi_apache2.c:1.41 > > --- php-src/sapi/apache2handler/sapi_apache2.c:1.40 Fri Jun 25 > > 09:00:48 2004 > > +++ php-src/sapi/apache2handler/sapi_apache2.c Sat Jul 17 17:29:50 2004 > > @@ -18,7 +18,7 @@ > > > > +---------------------------------------------------------------------- > > + > > */ > > > > -/* $Id: sapi_apache2.c,v 1.40 2004/06/25 13:00:48 edink Exp $ */ > > +/* $Id: sapi_apache2.c,v 1.41 2004/07/17 21:29:50 moriyoshi Exp $ */ > > > > #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS > > > > @@ -547,6 +547,8 @@ > > #endif > > } > > > > +} zend_end_try(); > > + > > if (!parent_req) { > > php_apache_request_dtor(r TSRMLS_CC); > > ctx->request_processed = 1; > > @@ -561,8 +563,6 @@ > > } else { > > ctx->r = parent_req; > > } > > - > > -} zend_end_try(); > > > > return OK; > > } > > > > -- > > PHP CVS Mailing List (http://www.php.net/) > > To unsubscribe, visit: http://www.php.net/unsub.php