]> granicus.if.org Git - php/commitdiff
fix bug with variables clobbered by longjmp
authorStanislav Malyshev <stas@php.net>
Tue, 8 Aug 2006 13:12:37 +0000 (13:12 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 8 Aug 2006 13:12:37 +0000 (13:12 +0000)
sapi/apache2handler/sapi_apache2.c

index 4b9b93008fff0ee0bb8e6dc4cfcfbcb0e69371c5..346c2a462ed67c71e540e2cf021d14e0bba11bec 100644 (file)
@@ -460,12 +460,12 @@ static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
 
 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);