diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2006-05-06 13:26:49 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2006-05-06 13:26:49 +0000 |
| commit | f12d3a0ccb6b5f12408152f1e699e0d91ebfe909 (patch) | |
| tree | 7e77ab1846eeb19035bf34f40c8aa72a0f2fd4db /net/php5-soap/files | |
| parent | Update maintainer address (diff) | |
Simplify PHP base ports infrastructure:
- remove all slave ports
- add the ability to build all SAPIs concurrently
- update php5 to 5.1.4
*Read* the UPDATING file *before* trying to update PHP
(or at least before mailing me).
Notes
Notes:
svn path=/head/; revision=161492
Diffstat (limited to 'net/php5-soap/files')
| -rw-r--r-- | net/php5-soap/files/patch-soap.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/net/php5-soap/files/patch-soap.c b/net/php5-soap/files/patch-soap.c index df3735357d7c..8fcdd7ddbc42 100644 --- a/net/php5-soap/files/patch-soap.c +++ b/net/php5-soap/files/patch-soap.c @@ -1,5 +1,5 @@ ---- soap.c.orig Tue Jan 24 08:02:15 2006 -+++ soap.c Tue Jan 24 08:03:06 2006 +--- soap.c.orig Fri Mar 24 09:45:54 2006 ++++ soap.c Sat May 6 10:28:32 2006 @@ -23,7 +23,7 @@ #include "config.h" #endif @@ -9,16 +9,16 @@ #include "ext/session/php_session.h" #endif #ifdef ZEND_ENGINE_2 -@@ -1509,7 +1509,7 @@ +@@ -1523,7 +1523,7 @@ + soap_obj = NULL; if (service->type == SOAP_CLASS) { - soap_obj = NULL; -#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) +#if HAVE_PHP_SESSION /* If persistent then set soap_obj from from the previous created session (if available) */ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { zval **tmp_soap; -@@ -1598,7 +1598,7 @@ +@@ -1610,7 +1610,7 @@ } efree(class_name); } @@ -27,7 +27,7 @@ /* If session then update session hash with new object */ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { zval **tmp_soap_pp; -@@ -1691,7 +1691,7 @@ +@@ -1706,7 +1706,7 @@ zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) { if (service->type == SOAP_CLASS) { call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC); @@ -36,3 +36,12 @@ if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { zval_ptr_dtor(&soap_obj); } +@@ -1728,7 +1728,7 @@ + instanceof_function(Z_OBJCE_P(EG(exception)), soap_fault_class_entry TSRMLS_CC)) { + soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); + } +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + #else + if (soap_obj) { |