Initial import

5 files changed, 85 insertions, 2 deletions

diff --git a/dev-php/php-cgi/ChangeLog b/dev-php/php-cgi/ChangeLog
index 3a9c6b259a85..fc48b9dc9a5a 100644
--- a/dev-php/php-cgi/ChangeLog
+++ b/dev-php/php-cgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/php-cgi
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.27 2004/07/15 11:46:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/ChangeLog,v 1.28 2004/07/22 13:11:55 stuart Exp $
+
+*php-cgi-5.0.0 (22 Jul 2004)
+
+  22 Jul 2004; Stuart Herbert <stuart@gentoo.org>
+  +files/php5_soap_persistence_session.diff, +php-cgi-5.0.0.ebuild:
+  Initial import
 
   15 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> php-cgi-4.3.8.ebuild:
   Stable on alpha, see bug #56985.
diff --git a/dev-php/php-cgi/Manifest b/dev-php/php-cgi/Manifest
index f6e9cf3f7d3e..9a976f860d39 100644
--- a/dev-php/php-cgi/Manifest
+++ b/dev-php/php-cgi/Manifest
@@ -1,4 +1,4 @@
-MD5 80f6f741da4f882aa1e3610a5eb669dc ChangeLog 3502
+MD5 ff00a5a3237a7e08dd03e6bf2e851eee ChangeLog 3668
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
 MD5 22244fe422175e6371727eba17d37ff1 php-cgi-4.3.4-r2.ebuild 713
 MD5 021f585c6dbc6fbd4a9d28368508e7dd php-cgi-4.3.5.ebuild 688
@@ -8,6 +8,7 @@ MD5 417086a2a3c4e674e77e6c5150a68133 php-cgi-4.3.6_rc2.ebuild 736
 MD5 1f49e8beeb045ec0111e0873bfb07fdb php-cgi-4.3.7-r1.ebuild 751
 MD5 5b1a215e21110a1e5a603b3a21e5fd53 php-cgi-4.3.7.ebuild 687
 MD5 423bd6c00ab92c007d9f2f9630c1e9ea php-cgi-4.3.8.ebuild 746
+MD5 1e8d7c095859a6bb59b46cb9418f335d php-cgi-5.0.0.ebuild 751
 MD5 c2702f299c02afa047535bf819093868 files/digest-php-cgi-4.3.4-r2 282
 MD5 abf76ecb45117098456e6ee3bf69944e files/digest-php-cgi-4.3.5 282
 MD5 707c9fff181593ffacc69ce674a92a8a files/digest-php-cgi-4.3.6 350
@@ -17,3 +18,5 @@ MD5 01013db7bcb660532237428f5aa61b26 files/digest-php-cgi-4.3.7 281
 MD5 01013db7bcb660532237428f5aa61b26 files/digest-php-cgi-4.3.7-r1 281
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 390a659097a43447e44ab5bdd59378b5 files/digest-php-cgi-4.3.8 282
+MD5 11f305b98b753ee023da8503a360762a files/digest-php-cgi-5.0.0 63
+MD5 273799e60d5a41a1e6f5ac53781a152f files/php5_soap_persistence_session.diff 1976
diff --git a/dev-php/php-cgi/files/digest-php-cgi-5.0.0 b/dev-php/php-cgi/files/digest-php-cgi-5.0.0
new file mode 100644
index 000000000000..6c4e3a2e19be
--- /dev/null
+++ b/dev-php/php-cgi/files/digest-php-cgi-5.0.0
@@ -0,0 +1 @@
+MD5 562b7ad1e903248bbe77884cb904b8b7 php-5.0.0.tar.bz2 4554054
diff --git a/dev-php/php-cgi/files/php5_soap_persistence_session.diff b/dev-php/php-cgi/files/php5_soap_persistence_session.diff
new file mode 100644
index 000000000000..626ac67f9081
--- /dev/null
+++ b/dev-php/php-cgi/files/php5_soap_persistence_session.diff
@@ -0,0 +1,35 @@
+diff -ruN php-5.0.0RC3.orig/ext/soap/soap.c php-5.0.0RC3/ext/soap/soap.c
+--- php-5.0.0RC3.orig/ext/soap/soap.c	2004-06-22 19:35:59.801348936 +0300
++++ php-5.0.0RC3/ext/soap/soap.c	2004-06-29 13:39:00.506820928 +0300
+@@ -1341,16 +1341,21 @@
+ 		soap_obj = NULL;
+ #if HAVE_PHP_SESSION
+ 		/* If persistent then set soap_obj from from the previous created session (if available) */
++		char soapname[32+sizeof("_bogus_session_name")]; //Now we use  max 32 chars from class name, must be overwriten with dynamic allocation with exact length!!
+ 		if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ 			zval **tmp_soap;
+ 
++			bzero(soapname,32+sizeof("_bogus_session_name"));
++                        strncpy(soapname,service->soap_class.ce->name,32);
++                        strcat(soapname,"_bogus_session_name");
++
+ 			if (PS(session_status) != php_session_active &&
+ 			    PS(session_status) != php_session_disabled) {
+ 				php_session_start(TSRMLS_C);
+ 			}
+ 
+ 			/* Find the soap object and assign */
+-			if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), (void **) &tmp_soap) == SUCCESS &&
++			if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), (void **) &tmp_soap) == SUCCESS &&
+ 			    Z_TYPE_PP(tmp_soap) == IS_OBJECT &&
+ 			    Z_OBJCE_PP(tmp_soap) == service->soap_class.ce) {
+ 				soap_obj = *tmp_soap;
+@@ -1432,7 +1437,7 @@
+ 			/* If session then update session hash with new object */
+ 			if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
+ 				zval **tmp_soap_pp;
+-				if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), "_bogus_session_name", sizeof("_bogus_session_name"), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
++				if (zend_hash_update(Z_ARRVAL_P(PS(http_session_vars)), soapname, sizeof(soapname), &tmp_soap, sizeof(zval *), (void **)&tmp_soap_pp) == SUCCESS) {
+ 					soap_obj = *tmp_soap_pp;
+ 				}
+ 			} else {
diff --git a/dev-php/php-cgi/php-cgi-5.0.0.ebuild b/dev-php/php-cgi/php-cgi-5.0.0.ebuild
new file mode 100644
index 000000000000..53b3db29db8e
--- /dev/null
+++ b/dev-php/php-cgi/php-cgi-5.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php-cgi/php-cgi-5.0.0.ebuild,v 1.1 2004/07/22 13:11:55 stuart Exp $
+
+PHPSAPI="cgi"
+MY_P="php-${PVR}"
+
+inherit php5-sapi eutils
+
+DESCRIPTION="PHP CGI"
+SLOT="0"
+KEYWORDS="-x86 -sparc -alpha -hppa -ppc"
+
+# for this revision only
+PDEPEND=">=${PHP_PROVIDER_PKG}-5.0.0"
+
+src_compile() {
+	# CLI needed to build stuff
+	my_conf="${my_conf} \
+		--enable-cgi \
+		--enable-cli \
+		--enable-fastcgi"
+
+	php5-sapi_src_compile
+}
+
+
+src_install() {
+	PHP_INSTALLTARGETS="install"
+	php5-sapi_src_install
+
+	# rename binary
+	mv ${D}/usr/bin/php ${D}/usr/bin/php-cgi
+}
+
+pkg_postinst() {
+	einfo "This is a CGI only build."
+}