[packages/php.git] / php-vhost.patch

diff -ur php-4.3.4/sapi/apache/mod_php4.c php-4.3.5RC2/sapi/apache/mod_php4.c
--- php-4.3.4/sapi/apache/mod_php4.c	Tue Jun  3 07:41:49 2003
+++ php-4.3.5RC2/sapi/apache/mod_php4.c	Wed Jan 28 18:42:20 2004
@@ -830,6 +830,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);
Commit	Line	Data
ef4e6300	1	diff -ur php-4.3.4/sapi/apache/mod_php4.c php-4.3.5RC2/sapi/apache/mod_php4.c
	2	--- php-4.3.4/sapi/apache/mod_php4.c Tue Jun 3 07:41:49 2003
	3	+++ php-4.3.5RC2/sapi/apache/mod_php4.c Wed Jan 28 18:42:20 2004
	4	@@ -830,6 +830,9 @@
	5	}
	6	if(!AP(xbithack)) {
	7	r->allowed \|= (1 << METHODS) - 1;
	8	+ zend_try {
	9	+ zend_ini_deactivate(TSRMLS_C);
	10	+ } zend_end_try();
	11	return DECLINED;
	12	}
	13	return send_parsed_php(r);