diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2004-07-10 16:28:15 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2004-07-10 16:28:15 +0000 |
| commit | e1b6b1629441591f2854a08800f26aab6c1b8da3 (patch) | |
| tree | 6ad709f201ede7d0ff6e03111835a20c9d451e8f /dev-php/mod_php/files | |
| parent | Add dev-python/pygtk-2.3* (diff) | |
| download | gentoo-2-e1b6b1629441591f2854a08800f26aab6c1b8da3.tar.gz gentoo-2-e1b6b1629441591f2854a08800f26aab6c1b8da3.tar.bz2 gentoo-2-e1b6b1629441591f2854a08800f26aab6c1b8da3.zip | |
Initial import for mod_php5
Diffstat (limited to 'dev-php/mod_php/files')
| -rw-r--r-- | dev-php/mod_php/files/70_mod_php5.conf | 37 | ||||
| -rw-r--r-- | dev-php/mod_php/files/digest-mod_php-5.0.0 | 1 | ||||
| -rw-r--r-- | dev-php/mod_php/files/php5_soap_persistence_session.diff | 35 |
3 files changed, 73 insertions, 0 deletions
diff --git a/dev-php/mod_php/files/70_mod_php5.conf b/dev-php/mod_php/files/70_mod_php5.conf new file mode 100644 index 000000000000..60a463c0d248 --- /dev/null +++ b/dev-php/mod_php/files/70_mod_php5.conf @@ -0,0 +1,37 @@ +<IfDefine PHP5> + + # Load the module first + <IfModule !sapi_apache2.c> + LoadModule php5_module extramodules/libphp5.so + </IfModule> + + # Set it to handle the files + <IfModule mod_mime.c> + AddType application/x-httpd-php .php + AddType application/x-httpd-php .phtml + AddType application/x-httpd-php .php3 + AddType application/x-httpd-php .php4 + AddType application/x-httpd-php .php5 + AddType application/x-httpd-php-source .phps + </IfModule> + + <Files *.php> + RequestHeader unset If-Modified-Since + </Files> + <Files *.php3> + RequestHeader unset If-Modified-Since + </Files> + <Files *.php4> + RequestHeader unset If-Modified-Since + </Files> + <Files *.php5> + RequestHeader unset If-Modified-Since + </Files> + <Files *.phps> + RequestHeader unset If-Modified-Since + </Files> + <Files *.phtml> + RequestHeader unset If-Modified-Since + </Files> + +</IfDefine> diff --git a/dev-php/mod_php/files/digest-mod_php-5.0.0 b/dev-php/mod_php/files/digest-mod_php-5.0.0 new file mode 100644 index 000000000000..fd4537e875e8 --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-5.0.0 @@ -0,0 +1 @@ +MD5 aa24589d3c173052998792e4a6d255fa php-5.0.0RC3.tar.bz2 4535975 diff --git a/dev-php/mod_php/files/php5_soap_persistence_session.diff b/dev-php/mod_php/files/php5_soap_persistence_session.diff new file mode 100644 index 000000000000..626ac67f9081 --- /dev/null +++ b/dev-php/mod_php/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 { |