mirror of
https://git.freebsd.org/ports.git
synced 2025-07-01 01:20:31 -04:00
76ea697dac
- update backports patch to latest version (20120504) - align pathnames in slave ports - bump PORTREVISION The only drawback of this change is that now for building of every slave port (php extension) we extracting full php52 source tree. Apologies that it took that long. PR: 164849 Submitted by: Svyatoslav Lempert <svyatoslav.lempert at gmail dot com> Approved by: Alex Keda <admin at lissyara dot su> Security: 60de13d5-95f0-11e1-806a-001143cd36d8
56 lines
2.1 KiB
C
56 lines
2.1 KiB
C
--- ext/soap/soap.c.orig Tue Oct 3 21:51:01 2006
|
|
+++ ext/soap/soap.c Sat Nov 4 11:38:29 2006
|
|
@@ -23,7 +23,7 @@
|
|
#include "config.h"
|
|
#endif
|
|
#include "php_soap.h"
|
|
-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
|
|
+#if HAVE_PHP_SESSION
|
|
#include "ext/session/php_session.h"
|
|
#endif
|
|
#ifdef ZEND_ENGINE_2
|
|
@@ -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;
|
|
@@ -1664,7 +1664,7 @@
|
|
}
|
|
efree(class_name);
|
|
}
|
|
-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
|
|
+#if HAVE_PHP_SESSION
|
|
/* 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 @@
|
|
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);
|
|
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) {
|
|
#else
|
|
if (soap_obj) {
|