summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2006-08-08 13:11:39 +0000
committerStanislav Malyshev <stas@php.net>2006-08-08 13:11:39 +0000
commitfc45bcc239c528e7009cf2d0a3973dd21f3a0d81 (patch)
tree0f9b3cd78cb32fcff8d2ded7ef83ad4cf6b1d022
parent6234066f367ae20757c53022e03d47d4c1eccc70 (diff)
downloadphp-git-fc45bcc239c528e7009cf2d0a3973dd21f3a0d81.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 30e0458d3a..945e907490 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -459,12 +459,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);