summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2004-01-28 17:59:07 +0000
committerRasmus Lerdorf <rasmus@php.net>2004-01-28 17:59:07 +0000
commita61c2d667c93eb13c0677328194cffbd6847618d (patch)
tree0a14805a95ed72586b70524cf50befaca9ee8b9f /sapi
parent44df89f00d6ea10d1dd86f2e522702c131fc4d07 (diff)
downloadphp-git-a61c2d667c93eb13c0677328194cffbd6847618d.tar.gz
Fix applies to apache_hooks sapi as well. See bug #25753 for details.
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache_hooks/mod_php5.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index 8551ad0dd8..b15f360475 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -1175,6 +1175,9 @@ static int php_xbithack_handler(request_rec * r)
}
if(!AP(xbithack)) {
r->allowed |= (1 << METHODS) - 1;
+ zend_try {
+ zend_ini_deactivate(TSRMLS_C);
+ } zend_end_try();
return DECLINED;
}
return send_parsed_php(r);