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

From: Date: Tue, 08 Aug 2006 13:11:39 +0000
Subject: cvs: php-src(PHP_5_1) /sapi/apache2handler sapi_apache2.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-39836@lists.php.net to get a copy of this message
stas Tue Aug 8 13:11:39 2006 UTC Modified files: (Branch: PHP_5_1) /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.57.2.10&r2=1.57.2.11&diff_format=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10 php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.11 --- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10 Sun Mar 19 14:54:53 2006 +++ php-src/sapi/apache2handler/sapi_apache2.c Tue Aug 8 13:11:39 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.57.2.10 2006/03/19 14:54:53 mike Exp $ */ +/* $Id: sapi_apache2.c,v 1.57.2.11 2006/08/08 13:11:39 stas Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -459,12 +459,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 php_apache_ini_dtor(r, parent_req TSRMLS_CC);

« previous php.cvs (#39836) next »