diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-01-31 22:56:37 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-01-31 22:56:37 +0000 |
| commit | a64efe95c41280076c54cd8b8547bcef9135350b (patch) | |
| tree | b777c71e0c8b250d920e0fb1c2e910a7c5cd9dbe /dev-php/mod_php/files | |
| parent | Version bumped. Closes 38337 (diff) | |
| download | historical-a64efe95c41280076c54cd8b8547bcef9135350b.tar.gz historical-a64efe95c41280076c54cd8b8547bcef9135350b.tar.bz2 historical-a64efe95c41280076c54cd8b8547bcef9135350b.zip | |
Fix for bug #39952
Diffstat (limited to 'dev-php/mod_php/files')
| -rw-r--r-- | dev-php/mod_php/files/mod_php-4.3.4-r3.diff | 27 |
1 files changed, 27 insertions, 0 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 index 018aacf62d8c..acd65e864c5a 100644 --- 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 @@ -22,3 +22,30 @@ 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; + } + |