summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2006-08-08 13:10:46 +0000
committerStanislav Malyshev <stas@php.net>2006-08-08 13:10:46 +0000
commit38eaacafdf19e32e0b663c76b60a12edadb7dbad (patch)
treee84ba646c07940b714c36e4cd33ae38055566a9b
parent2c00988f17eb091de2da3799fb29378901f4a32c (diff)
downloadphp-git-38eaacafdf19e32e0b663c76b60a12edadb7dbad.tar.gz
fix bug with variables clobbered by longjmp
-rw-r--r--sapi/apache2handler/sapi_apache2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index e989211deb..bf7d645666 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -438,12 +438,12 @@ static void php_apache_request_dtor(request_rec *r 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 \