Fix bug in Apache2 SAPI.

Package-Manager: portage-2.0.53_rc6

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 576ff54714bbdb4bfa9e5da744690a03ded6228f..31eadea7b5d8e6b1e3aa33bfa0c3735aa76b5823 100644 (file)
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.284 2005/11/04 12:12:57 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.285 2005/11/04 13:00:23 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.
 
 *mod_php-4.4.0-r9 (04 Nov 2005)
 *mod_php-4.4.0-r8 (04 Nov 2005)

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 56c9ccbabba3b180b0b21ee5606be21af8d22880..5546dc5fa109d29c5dc04f04c8b54ae64b29631d 100644 (file)
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,4 +1,4 @@
-MD5 3812c371806dc741ce8974c0733cdfc2 ChangeLog 50437
+MD5 fd9ecaf0c839a69bec94b062c275af78 ChangeLog 50611
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
 MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0-a1/70_mod_php.conf 484
@@ -29,7 +29,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
@@ -38,7 +38,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 90610a0b9cdbcbec3cd33fcef432e00c mod_php-4.3.11-r1.ebuild 7127
 MD5 3e4b2d8a6ea6c859ef96e9de3aed8b81 mod_php-4.3.11-r3.ebuild 8053

diff --git a/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch b/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch
index 3836776b14b4b102f81f77c7dacf4b8c5a748e75..65886a2488e6d97bb16b9018b0a1a618df1ac65d 100644 (file)
--- a/dev-php/mod_php/files/php4.3.11-session_save_path-segf.patch
+++ b/dev-php/mod_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/mod_php/files/php4.4.0-session_save_path-segf.patch b/dev-php/mod_php/files/php4.4.0-session_save_path-segf.patch
index 8f936ae5ec3966e56f9775fbe1ee788cf29109c2..2c712b0da2d69ab356fb8dd1679e7eb6b9f9d92e 100644 (file)
--- a/dev-php/mod_php/files/php4.4.0-session_save_path-segf.patch
+++ b/dev-php/mod_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();
 +                      }

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index b96df0907ebe0cdb222b601ddd28685fece9457e..13c348111dea7d5215eb5b8b01a40d9dba23d079 100644 (file)
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.107 2005/11/04 12:11:00 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.108 2005/11/04 12:57:28 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-cgi-4.4.0-r5 (04 Nov 2005)
 *php-cgi-4.3.11-r5 (04 Nov 2005)

diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index e6e94e9e88315c80079cb3629fb2a67205380fe8..20a11091acd0ac5486da25d911e7b45d622410be 100644 (file)
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,4 +1,4 @@
-MD5 1175687dc920787f11020bbc244ff8e6 ChangeLog 16021
+MD5 f37c3bc785f987ab077fcd74539cad53 ChangeLog 16195
 MD5 cc21a816357d93a1d31cd44f861183c7 files/digest-php-cgi-4.3.11-r1 287
 MD5 05df4c881b1833626d9a75a08a0098fd files/digest-php-cgi-4.3.11-r2 364
 MD5 05df4c881b1833626d9a75a08a0098fd files/digest-php-cgi-4.3.11-r4 364
@@ -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 ff97ecdd5c6b9744c3770bf335bb1157 php-cgi-4.3.11-r1.ebuild 1116
 MD5 f03786f41f7eb2be4bf8854c52d09f97 php-cgi-4.3.11-r2.ebuild 1866

diff --git a/dev-php/php-cgi/files/php4.3.11-session_save_path-segf.patch b/dev-php/php-cgi/files/php4.3.11-session_save_path-segf.patch
index 3836776b14b4b102f81f77c7dacf4b8c5a748e75..65886a2488e6d97bb16b9018b0a1a618df1ac65d 100644 (file)
--- a/dev-php/php-cgi/files/php4.3.11-session_save_path-segf.patch
+++ b/dev-php/php-cgi/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-cgi/files/php4.4.0-session_save_path-segf.patch b/dev-php/php-cgi/files/php4.4.0-session_save_path-segf.patch
index 8f936ae5ec3966e56f9775fbe1ee788cf29109c2..2c712b0da2d69ab356fb8dd1679e7eb6b9f9d92e 100644 (file)
--- a/dev-php/php-cgi/files/php4.4.0-session_save_path-segf.patch
+++ b/dev-php/php-cgi/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();
 +                      }

diff --git a/dev-php/php/ChangeLog b/dev-php/php/ChangeLog
index 7f82b690d41ccf0c6f099210c53da545f27356c2..c5e0bd8b77afe14e63dcd96ee602408a4c09e48d 100644 (file)
--- 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 2b54a46718880323701bc3cc6b9656871e345761..1b228b3e233a3eb517fc68d80bf845a72d4cea1b 100644 (file)
--- 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 3836776b14b4b102f81f77c7dacf4b8c5a748e75..65886a2488e6d97bb16b9018b0a1a618df1ac65d 100644 (file)
--- 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 8f936ae5ec3966e56f9775fbe1ee788cf29109c2..2c712b0da2d69ab356fb8dd1679e7eb6b9f9d92e 100644 (file)
--- 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();
 +                      }