This commit was manufactured by cvs2git to create branch 'RA-branch'.

Cherrypick from master 2004-02-13 15:19:48 UTC ankry <ankry@pld-linux.org> '- extracted from 4.3.5RC2':
    php-vhost.patch -> 1.1

diff --git a/php-vhost.patch b/php-vhost.patch
new file mode 100644 (file)
index 0000000..a2842f8
--- /dev/null
+++ b/php-vhost.patch
@@ -0,0 +1,13 @@
+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);