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 | 937184f1df74b219f746664c5e584c11098ca470 (patch) | |
| tree | bc946f7778cde9f09de979af8f2690e648d6eebb /dev-php | |
| parent | Version bumped. Closes 38337 (diff) | |
| download | gentoo-2-937184f1df74b219f746664c5e584c11098ca470.tar.gz gentoo-2-937184f1df74b219f746664c5e584c11098ca470.tar.bz2 gentoo-2-937184f1df74b219f746664c5e584c11098ca470.zip | |
Fix for bug #39952
Diffstat (limited to 'dev-php')
| -rw-r--r-- | dev-php/mod_php/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-php/mod_php/Manifest | 2 | ||||
| -rw-r--r-- | dev-php/mod_php/files/mod_php-4.3.4-r3.diff | 27 |
3 files changed, 32 insertions, 2 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index ac4dc5177dab..bfc13882f179 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.122 2004/01/31 22:38:34 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.123 2004/01/31 22:56:37 stuart Exp $ + + 31 Jan 2004; Stuart Herbert <stuart@gentoo.org> files/mod_php-4.3.4-r3.diff: + Additional holes added to the patch *mod_php-4.3.4-r3 (31 Jan 2004) diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 5bc18ae79dc2..f3e7e86c726a 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -33,4 +33,4 @@ MD5 e007fc4a17373504abd024180c0d0b3f files/digest-mod_php-4.3.3-r3 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r1 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r2 137 MD5 5547bf31e6a425747226d5984cff04e9 files/digest-mod_php-4.3.4-r3 137 -MD5 a2d8e8581e5d9c13cdc4b5997df05b9f files/mod_php-4.3.4-r3.diff 948 +MD5 b8cfdda8dd4c656e170607b282cb0019 files/mod_php-4.3.4-r3.diff 1717 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; + } + |