cvs: php-src /sapi/apache mod_php5.c
| From: | Rasmus Lerdorf | Date: | Wed, 28 Jan 2004 17:49:50 +0000 |
| Subject: | cvs: php-src /sapi/apache mod_php5.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-25917@lists.php.net to get a copy of this message | ||
rasmus Wed Jan 28 12:49:50 2004 EDT
Modified files:
/php-src/sapi/apache mod_php5.c
Log:
MFB - see bug #25753 for details
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.7&r2=1.8&ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.7 php-src/sapi/apache/mod_php5.c:1.8
--- php-src/sapi/apache/mod_php5.c:1.7 Thu Jan 8 03:18:03 2004
+++ php-src/sapi/apache/mod_php5.c Wed Jan 28 12:49:49 2004
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.7 2004/01/08 08:18:03 andi Exp $ */
+/* $Id: mod_php5.c,v 1.8 2004/01/28 17:49:49 rasmus Exp $ */
#include "php_apache_http.h"
#include "http_conf_globals.h"
@@ -837,6 +837,9 @@
}
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);