summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2006-08-08 13:34:14 +0000
committerStanislav Malyshev <stas@php.net>2006-08-08 13:34:14 +0000
commit0617904d0a214e4928f77c814e22cce55531da90 (patch)
tree615d2f193ae9cf5549ecb6d4be6ca7175421299c
parent03ee80782462851f504d38ae8f683cf4e6bdc6d7 (diff)
downloadphp-git-0617904d0a214e4928f77c814e22cce55531da90.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 67876848c2..b2c99f0d45 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -465,12 +465,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);