diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2006-11-06 17:43:11 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2006-11-06 17:43:11 +0000 |
| commit | 8fbcab85d9ace37305253f5145e936118101448c (patch) | |
| tree | cb6e626ffd47af169d8e7698cf5cd88392959be4 /net/php5-soap | |
| parent | 0e4aaea53687b782547527ccff1586b1ae9e6453 (diff) | |
| download | ports-8fbcab85d9ace37305253f5145e936118101448c.tar.gz ports-8fbcab85d9ace37305253f5145e936118101448c.zip | |
Update to 5.2.0 release.
Notes
Notes:
svn path=/head/; revision=176626
Diffstat (limited to 'net/php5-soap')
| -rw-r--r-- | net/php5-soap/files/patch-soap.c | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/net/php5-soap/files/patch-soap.c b/net/php5-soap/files/patch-soap.c index 8fcdd7ddbc42..70b84d3a60e9 100644 --- a/net/php5-soap/files/patch-soap.c +++ b/net/php5-soap/files/patch-soap.c @@ -1,5 +1,5 @@ ---- soap.c.orig Fri Mar 24 09:45:54 2006 -+++ soap.c Sat May 6 10:28:32 2006 +--- soap.c.orig Tue Oct 3 21:51:01 2006 ++++ soap.c Sat Nov 4 11:38:29 2006 @@ -23,7 +23,7 @@ #include "config.h" #endif @@ -9,16 +9,16 @@ #include "ext/session/php_session.h" #endif #ifdef ZEND_ENGINE_2 -@@ -1523,7 +1523,7 @@ - - soap_obj = NULL; - if (service->type == SOAP_CLASS) { +@@ -1577,7 +1577,7 @@ + soap_obj = service->soap_object; + function_table = &((Z_OBJCE_P(soap_obj))->function_table); + } else if (service->type == SOAP_CLASS) { -#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; -@@ -1610,7 +1610,7 @@ +@@ -1664,7 +1664,7 @@ } efree(class_name); } @@ -27,21 +27,30 @@ /* If session then update session hash with new object */ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { zval **tmp_soap_pp; -@@ -1706,7 +1706,7 @@ - zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) { - if (service->type == SOAP_CLASS) { +@@ -1762,7 +1762,7 @@ + if (service->type == SOAP_CLASS || service->type == SOAP_OBJECT) { call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC); + if (service->type == SOAP_CLASS) { -#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) +#if HAVE_PHP_SESSION - 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)) { + if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + zval_ptr_dtor(&soap_obj); + soap_obj = NULL; +@@ -1788,7 +1788,7 @@ soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); } + if (service->type == SOAP_CLASS) { +-#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) { +@@ -1830,7 +1830,7 @@ + soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); + } + if (service->type == SOAP_CLASS) { -#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) +#if HAVE_PHP_SESSION - if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { #else - if (soap_obj) { + if (soap_obj) { |