From: Stanislav Malyshev <stas@php.net>
Date: Tue, 8 Aug 2006 13:12:37 +0000 (+0000)
Subject: fix bug with variables clobbered by longjmp
X-Git-Tag: RELEASE_1_0_0RC1~2039
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9a858d7adf7ce577585cf00eab408b1a13215ec;p=php

fix bug with variables clobbered by longjmp
---

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 4b9b93008f..346c2a462e 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -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);