diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2005-11-04 13:00:23 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2005-11-04 13:00:23 +0000 |
| commit | 17a46eb2f59d2aa581270d361bd7373815d5455a (patch) | |
| tree | 70e23c8bc3bb03d54b0620468aea485a7acbdd9b /dev-php/php | |
| parent | New upstream version. (diff) | |
| download | gentoo-2-17a46eb2f59d2aa581270d361bd7373815d5455a.tar.gz gentoo-2-17a46eb2f59d2aa581270d361bd7373815d5455a.tar.bz2 gentoo-2-17a46eb2f59d2aa581270d361bd7373815d5455a.zip | |
Fix bug in Apache2 SAPI.
(Portage version: 2.0.53_rc6)
Diffstat (limited to 'dev-php/php')
| -rw-r--r-- | dev-php/php/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-php/php/Manifest | 6 | ||||
| -rw-r--r-- | dev-php/php/files/php4.3.11-session_save_path-segf.patch | 2 | ||||
| -rw-r--r-- | dev-php/php/files/php4.4.0-session_save_path-segf.patch | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog index 7f82b690d41c..c5e0bd8b77af 100644 --- a/dev-php/php/ChangeLog +++ b/dev-php/php/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-php/php # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.203 2005/11/04 12:09:52 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/php/ChangeLog,v 1.204 2005/11/04 12:56:09 chtekk Exp $ + + 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> + files/php4.3.11-session_save_path-segf.patch, + files/php4.4.0-session_save_path-segf.patch: + Fix bug in Apache2 SAPI. *php-4.4.0-r4 (04 Nov 2005) *php-4.3.11-r4 (04 Nov 2005) diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest index 2b54a4671888..1b228b3e233a 100644 --- a/dev-php/php/Manifest +++ b/dev-php/php/Manifest @@ -1,4 +1,4 @@ -MD5 6639c63b5eb415052c93824bf3743b75 ChangeLog 28784 +MD5 16820b9b43b82ccc18b52117ae1baebf ChangeLog 28958 MD5 289778209b2df87dbc5052351e604b1a files/digest-php-4.3.11 213 MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r1 290 MD5 a7b81d42cc56fdd6c72fbe2549dbe898 files/digest-php-4.3.11-r3 290 @@ -18,7 +18,7 @@ MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238 MD5 a9b932952f12aa01a9f98a7fcbf32ed9 files/php4.3.11-pcre-security.patch 6031 MD5 43b4113d1fb159955b0d5ed307cac143 files/php4.3.11-phpinfo_xss.patch 2518 MD5 48d9c939434e9b01d0696410d59c503c files/php4.3.11-pspell-ext-segf.patch 8482 -MD5 17b906361a7ab8a3008446871623eeae files/php4.3.11-session_save_path-segf.patch 4938 +MD5 2646498369dc5c64c318ee6da2f9487a files/php4.3.11-session_save_path-segf.patch 4961 MD5 0429f8334ba4bab659a2e41ce5debc80 files/php4.4.0-curl_safemode.patch 1937 MD5 cb36a386184ed6a887f62d2205f57173 files/php4.4.0-fopen_wrappers.patch 1481 MD5 a540c54ba22dc16b157edcf1ecb6258f files/php4.4.0-gd_safe_mode.patch 883 @@ -27,7 +27,7 @@ MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238 MD5 54a4ad0766f89185d7de2c6d07b07296 files/php4.4.0-pcre-security.patch 6177 MD5 57644300fb52ad610fa52ae8ba6b522b files/php4.4.0-phpinfo_xss.patch 1284 MD5 48d9c939434e9b01d0696410d59c503c files/php4.4.0-pspell-ext-segf.patch 8482 -MD5 83fb9efb602c178741ea2e40e13b014f files/php4.4.0-session_save_path-segf.patch 4132 +MD5 3d3986815e0e06adce512b36959e6f26 files/php4.4.0-session_save_path-segf.patch 4155 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 MD5 5c877d02b146b5885cecc89b9f445c73 php-4.3.11-r1.ebuild 1972 MD5 c757b9ce357a04d26ae0f88d731cf5c2 php-4.3.11-r3.ebuild 2898 diff --git a/dev-php/php/files/php4.3.11-session_save_path-segf.patch b/dev-php/php/files/php4.3.11-session_save_path-segf.patch index 3836776b14b4..65886a2488e6 100644 --- a/dev-php/php/files/php4.3.11-session_save_path-segf.patch +++ b/dev-php/php/files/php4.3.11-session_save_path-segf.patch @@ -138,7 +138,7 @@ + if (!parent_req) { + parent_req = ctx->r; + } -+ if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { ++ if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { + if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { + zend_bailout(); + } diff --git a/dev-php/php/files/php4.4.0-session_save_path-segf.patch b/dev-php/php/files/php4.4.0-session_save_path-segf.patch index 8f936ae5ec39..2c712b0da2d6 100644 --- a/dev-php/php/files/php4.4.0-session_save_path-segf.patch +++ b/dev-php/php/files/php4.4.0-session_save_path-segf.patch @@ -111,7 +111,7 @@ + if (!parent_req) { + parent_req = ctx->r; + } -+ if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { ++ if (parent_req && parent_req->handler && strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) { + if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) { + zend_bailout(); + } |