summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2006-08-08 13:12:37 +0000
committerStanislav Malyshev <stas@php.net>2006-08-08 13:12:37 +0000
commita9a858d7adf7ce577585cf00eab408b1a13215ec (patch)
tree6797e99852f09ec70fbdd08852f6dd7ebf2dfb68
parent7010fd0005ba8a71f8d61febd1b13792ee3e6798 (diff)
downloadphp-git-a9a858d7adf7ce577585cf00eab408b1a13215ec.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 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);