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

From: Date: Tue, 08 Aug 2006 13:10:46 +0000
Subject: cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-39835@lists.php.net to get a copy of this message
stas Tue Aug 8 13:10:46 2006 UTC Modified files: (Branch: PHP_5_0) /php-src/sapi/apache2handler sapi_apache2.c Log: fix bug with variables clobbered by longjmp http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.15&r2=1.40.2.16&diff_format=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.15 php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.16 --- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.15 Tue Nov 29 13:30:11 2005 +++ php-src/sapi/apache2handler/sapi_apache2.c Tue Aug 8 13:10:46 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.40.2.15 2005/11/29 13:30:11 dmitry Exp $ */ +/* $Id: sapi_apache2.c,v 1.40.2.16 2006/08/08 13:10:46 stas Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -438,12 +438,12 @@ static int php_handler(request_rec *r) { - php_struct *ctx; + php_struct * volatile ctx; void *conf; - apr_bucket_brigade *brigade; + apr_bucket_brigade * volatile brigade; apr_bucket *bucket; apr_status_t rv; - request_rec *parent_req = NULL; + request_rec * volatile parent_req = NULL; TSRMLS_FETCH(); #define PHPAP_INI_OFF \

« previous php.cvs (#39835) next »