--- embedaddon/php/ext/soap/php_packet_soap.c	2012/02/21 23:48:01	1.1.1.1
+++ embedaddon/php/ext/soap/php_packet_soap.c	2012/05/29 12:34:42	1.1.1.2
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <dmitry@zend.com>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_packet_soap.c,v 1.1.1.1 2012/02/21 23:48:01 misho Exp $ */
+/* $Id: php_packet_soap.c,v 1.1.1.2 2012/05/29 12:34:42 misho Exp $ */
 
 #include "php_soap.h"
 
@@ -191,21 +191,21 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 
 			tmp = get_node(fault->children, "faultstring");
 			if (tmp != NULL && tmp->children != NULL) {
-				zval *zv = master_to_zval(get_conversion(IS_STRING), tmp);
+				zval *zv = master_to_zval(get_conversion(IS_STRING), tmp TSRMLS_CC);
 				faultstring = Z_STRVAL_P(zv);
 				FREE_ZVAL(zv);
 			}
 
 			tmp = get_node(fault->children, "faultactor");
 			if (tmp != NULL && tmp->children != NULL) {
-				zval *zv = master_to_zval(get_conversion(IS_STRING), tmp);
+				zval *zv = master_to_zval(get_conversion(IS_STRING), tmp TSRMLS_CC);
 				faultactor = Z_STRVAL_P(zv);
 				FREE_ZVAL(zv);
 			}
 
 			tmp = get_node(fault->children, "detail");
 			if (tmp != NULL) {
-				details = master_to_zval(NULL, tmp);
+				details = master_to_zval(NULL, tmp TSRMLS_CC);
 			}
 		} else {
 			tmp = get_node(fault->children, "Code");
@@ -221,7 +221,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 				/* TODO: lang attribute */
 				tmp = get_node(tmp->children,"Text");
 				if (tmp != NULL && tmp->children != NULL) {
-					zval *zv = master_to_zval(get_conversion(IS_STRING), tmp);
+					zval *zv = master_to_zval(get_conversion(IS_STRING), tmp TSRMLS_CC);
 					faultstring = Z_STRVAL_P(zv);
 					FREE_ZVAL(zv);
 				}
@@ -229,7 +229,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 
 			tmp = get_node(fault->children,"Detail");
 			if (tmp != NULL) {
-				details = master_to_zval(NULL, tmp);
+				details = master_to_zval(NULL, tmp TSRMLS_CC);
 			}
 		}
 		add_soap_fault(this_ptr, faultcode, faultstring, faultactor, details TSRMLS_CC);
@@ -239,11 +239,9 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 		if (faultactor) {
 			efree(faultactor);
 		}
-#ifdef ZEND_ENGINE_2
 		if (details) {
 			Z_DELREF_P(details);
 		}
-#endif
 		xmlFreeDoc(response);
 		return FALSE;
 	}
@@ -327,9 +325,9 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 					} else {
 						/* Decoding value of parameter */
 						if (param != NULL) {
-							tmp = master_to_zval(param->encode, val);
+							tmp = master_to_zval(param->encode, val TSRMLS_CC);
 						} else {
-							tmp = master_to_zval(NULL, val);
+							tmp = master_to_zval(NULL, val TSRMLS_CC);
 						}
 					}
 					add_assoc_zval(return_value, param->paramName, tmp);
@@ -352,7 +350,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 						zval *tmp;
 						zval **arr;
 
-						tmp = master_to_zval(NULL, val);
+						tmp = master_to_zval(NULL, val TSRMLS_CC);
 						if (val->name) {
 							if (zend_hash_find(Z_ARRVAL_P(return_value), (char*)val->name, strlen((char*)val->name)+1, (void**)&arr) == SUCCESS) {
 								add_next_index_zval(*arr, tmp);
@@ -416,7 +414,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, in
 					}
 					smart_str_free(&key);
 				}
-				val = master_to_zval(enc, trav);
+				val = master_to_zval(enc, trav TSRMLS_CC);
 				add_assoc_zval(soap_headers, (char*)trav->name, val);
 			}
 			trav = trav->next;