cvs: php-src /sapi/apache_hooks mod_php5.c
| From: | Rasmus Lerdorf | Date: | Wed, 28 Jan 2004 17:59:07 +0000 |
| Subject: | cvs: php-src /sapi/apache_hooks mod_php5.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-25918@lists.php.net to get a copy of this message | ||
rasmus Wed Jan 28 12:59:07 2004 EDT
Modified files:
/php-src/sapi/apache_hooks mod_php5.c
Log:
Fix applies to apache_hooks sapi as well. See bug #25753 for details.
http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.1&r2=1.2&ty=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.1 php-src/sapi/apache_hooks/mod_php5.c:1.2
--- php-src/sapi/apache_hooks/mod_php5.c:1.1 Sat Jan 17 08:00:09 2004
+++ php-src/sapi/apache_hooks/mod_php5.c Wed Jan 28 12:59:07 2004
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski <zeev@zend.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: mod_php5.c,v 1.1 2004/01/17 13:00:09 sniper Exp $ */
+/* $Id: mod_php5.c,v 1.2 2004/01/28 17:59:07 rasmus Exp $ */
#include "php_apache_http.h"
@@ -1175,6 +1175,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);