From 0926c2d68184815a02f5cca31272552ad7775ce9 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Wed, 16 May 2012 07:36:13 +0000 Subject: Update to 5.4.3 release: - add support for embedded php library - add support for dtrace Re-organize bsd.php.mk: - add WANT_PHP_EMD - fix handling of WANT_PHP_* - remove php4 extensions From UPDATING: Suhosin patch has been disabled until the new version will be released (soon). Suhosing extension will take more time. LINKTHR option is now enabled by default, be sure to flag it if you are updating using an old saved configuration. sqlite2 extension has been permanently removed. If you want to remain at PHP 5.3, a new port (lang/php53) will be committed soon. --- net/php5-soap/files/patch-soap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'net/php5-soap/files') diff --git a/net/php5-soap/files/patch-soap.c b/net/php5-soap/files/patch-soap.c index 70b84d3a60e9..b81d1b8cac02 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 Oct 3 21:51:01 2006 -+++ soap.c Sat Nov 4 11:38:29 2006 +--- soap.c.orig 2012-03-02 15:46:04.000000000 +0100 ++++ soap.c 2012-03-02 15:45:38.000000000 +0100 @@ -23,7 +23,7 @@ #include "config.h" #endif @@ -8,8 +8,8 @@ +#if HAVE_PHP_SESSION #include "ext/session/php_session.h" #endif - #ifdef ZEND_ENGINE_2 -@@ -1577,7 +1577,7 @@ + #include "zend_exceptions.h" +@@ -1639,7 +1639,7 @@ soap_obj = service->soap_object; function_table = &((Z_OBJCE_P(soap_obj))->function_table); } else if (service->type == SOAP_CLASS) { @@ -18,7 +18,7 @@ /* 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; -@@ -1664,7 +1664,7 @@ +@@ -1722,7 +1722,7 @@ } efree(class_name); } @@ -27,16 +27,16 @@ /* If session then update session hash with new object */ if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { zval **tmp_soap_pp; -@@ -1762,7 +1762,7 @@ +@@ -1820,7 +1820,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); + 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); soap_obj = NULL; -@@ -1788,7 +1788,7 @@ +@@ -1845,7 +1845,7 @@ soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); } if (service->type == SOAP_CLASS) { @@ -45,7 +45,7 @@ if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { #else if (soap_obj) { -@@ -1830,7 +1830,7 @@ +@@ -1887,7 +1887,7 @@ soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); } if (service->type == SOAP_CLASS) { -- cgit v1.2.3