diff options
Diffstat (limited to 'dev-php/mod_php/files/mod_php-4.3.4-r3.diff')
-rw-r--r-- | dev-php/mod_php/files/mod_php-4.3.4-r3.diff | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/dev-php/mod_php/files/mod_php-4.3.4-r3.diff b/dev-php/mod_php/files/mod_php-4.3.4-r3.diff deleted file mode 100644 index acd65e864c5a..000000000000 --- a/dev-php/mod_php/files/mod_php-4.3.4-r3.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- sapi/apache/mod_php4.c.old 2004-01-31 21:44:55.000000000 +0000 -+++ sapi/apache/mod_php4.c 2004-01-31 21:49:59.000000000 +0000 -@@ -822,6 +822,9 @@ - - if (!(r->finfo.st_mode & S_IXUSR)) { - r->allowed |= (1 << METHODS) - 1; -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return DECLINED; - } - per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module); ---- sapi/apache2handler/sapi_apache2.c.old 2004-01-31 21:55:21.000000000 +0000 -+++ sapi/apache2handler/sapi_apache2.c 2004-01-31 21:55:26.000000000 +0000 -@@ -465,6 +465,9 @@ - if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) { - /* Check for xbithack in this case. */ - if (!AP2(xbithack) || strcmp(r->handler, "text/html") || !(r->finfo.protection & APR_UEXECUTE)) { -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return DECLINED; - } - } ---- sapi/apache2handler/sapi_apache2.c.old 2004-01-31 22:40:29.000000000 +0000 -+++ sapi/apache2handler/sapi_apache2.c 2004-01-31 22:42:23.000000000 +0000 -@@ -474,15 +474,24 @@ - - /* handle situations where user turns the engine off */ - if (!AP2(engine)) { -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return DECLINED; - } - - if (r->finfo.filetype == 0) { - php_apache_sapi_log_message("script not found or unable to stat"); -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return HTTP_NOT_FOUND; - } - if (r->finfo.filetype == APR_DIR) { - php_apache_sapi_log_message("attempt to invoke directory as script"); -+ zend_try { -+ zend_ini_deactivate(TSRMLS_C); -+ } zend_end_try(); - return HTTP_FORBIDDEN; - } - |