Modifying TS build.

Migrating to _ex API for hash traversal.

Author: faizshukri

ext/soap/php_encoding.c

@@ -558,7 +558,7 @@ xmlNodePtr to_xml_array(encodeType type, zval *data, int style)
 
 		if(style == SOAP_ENCODED)
 		{
-			get_array_type(data, &array_type);
+			get_array_type(data, &array_type TSRMLS_CC);
 			smart_str_append(&array_type_and_size, &array_type);
 			smart_str_appendc(&array_type_and_size, '[');
 			smart_str_append_long(&array_type_and_size, i);
@@ -1021,13 +1021,13 @@ int is_map(zval *array)
 	return FALSE;
 }
 
-void get_array_type(zval *array, smart_str *type)
+void get_array_type(zval *array, smart_str *type TSRMLS_DC)
 {
-	HashTable *ht = array->value.ht;
+	HashTable *ht = HASH_OF(array);
 	int i, count, cur_type, prev_type, different;
 	char *name = NULL;
 	zval **tmp;
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();*/
 
 	if(!array || Z_TYPE_P(array) != IS_ARRAY)
 		smart_str_appendl(type, "xsd:ur-type", 11);

ext/soap/php_encoding.h

@@ -218,7 +218,7 @@ encodePtr get_conversion_from_type_ex(HashTable *encoding, xmlNodePtr node, char
 encodePtr get_conversion_from_href_type_ex(HashTable *encoding, char *type, int len);
 
 int is_map(zval *array);
-void get_array_type(zval *array, smart_str *out_type);
+void get_array_type(zval *array, smart_str *out_type TSRMLS_DC);
 
 void delete_encoder(void *handle);
 

ext/soap/php_http.c

@@ -1,6 +1,6 @@
 #include "php_soap.h"
 
-void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, char *soapaction)
+void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, char *soapaction TSRMLS_DC)
 {
 	xmlChar *buf;
 	char *soap_headers;
@@ -10,7 +10,7 @@ void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, ch
 	SOAP_STREAM stream;
 	zval **trace;
 
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();*/
 
 	FETCH_THIS_SOCKET(stream);
 	FETCH_THIS_URL(phpurl);
@@ -149,7 +149,7 @@ void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, ch
 	xmlFree(buf);
 }
 
-void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len)
+void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len TSRMLS_DC)
 {
 	char *http_headers, *http_body, *content_type, *http_version, http_status[4], *cookie_itt;
 	int http_header_size, http_body_size, http_close;
@@ -158,7 +158,7 @@ void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len)
 	SOAP_STREAM stream;
 	zval **trace;
 
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();*/
 
 	FETCH_THIS_SDL(sdl);
 
@@ -167,7 +167,7 @@ void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len)
 		FETCH_SOCKET_RES(stream, socket_ref);
 	}
 
-	if(!get_http_headers(stream, &http_headers, &http_header_size))
+	if(!get_http_headers(stream, &http_headers, &http_header_size TSRMLS_CC))
 		php_error(E_ERROR, "Error Fetching http headers");
 
 	//Check to see what HTTP status was sent
@@ -200,22 +200,22 @@ void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len)
 			ZVAL_STRING(err, http_body, 1);
 			http_err = emalloc(strlen("HTTP request failed ()") + 4);
 			sprintf(http_err, "HTTP request failed (%s)", http_status);
-			add_soap_fault(thisObj, "SOAP-ENV:Client", http_err, NULL, err);
+			add_soap_fault(thisObj, "SOAP-ENV:Client", http_err, NULL, err TSRMLS_CC);
 			efree(http_err);
 			return;
 		}*/
 
 		//Try and get headers again
 		if(!strcmp(http_status, "100"))
 		{
-			if(!get_http_headers(stream, &http_headers, &http_header_size))
+			if(!get_http_headers(stream, &http_headers, &http_header_size TSRMLS_CC))
 				php_error(E_ERROR, "Error Fetching http headers");
 		}
 
 		efree(http_version);
 	}
 
-	if(!get_http_body(stream, http_headers, &http_body, &http_body_size))
+	if(!get_http_body(stream, http_headers, &http_body, &http_body_size TSRMLS_CC))
 		php_error(E_ERROR, "Error Fetching http body");
 
 	if(zend_hash_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace"), (void **) &trace) == SUCCESS
@@ -271,7 +271,7 @@ void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len)
 				zval *err;
 				MAKE_STD_ZVAL(err);
 				ZVAL_STRINGL(err, http_body, http_body_size, 1);
-				add_soap_fault(this_ptr, "SOAP-ENV:Client", "Didn't recieve an xml document", NULL, err);
+				add_soap_fault(this_ptr, "SOAP-ENV:Client", "Didn't recieve an xml document", NULL, err TSRMLS_CC);
 				efree(content_type);
 				return;
 			}
@@ -346,11 +346,11 @@ char *get_http_header_value(char *headers, char *type)
 	return var;
 }
 
-int get_http_body(SOAP_STREAM stream, char *headers,  char **response, int *out_size)
+int get_http_body(SOAP_STREAM stream, char *headers,  char **response, int *out_size TSRMLS_DC)
 {
 	char *trans_enc, *content_length, *http_buf;
 	int http_buf_size = 0;
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();*/
 
 	trans_enc = get_http_header_value(headers, "Transfer-Encoding: ");
 	content_length = get_http_header_value(headers, "Content-Length: ");
@@ -425,12 +425,12 @@ int get_http_body(SOAP_STREAM stream, char *headers,  char **response, int *out_
 	return TRUE;
 }
 
-int get_http_headers(SOAP_STREAM stream, char **response, int *out_size)
+int get_http_headers(SOAP_STREAM stream, char **response, int *out_size TSRMLS_DC)
 {
 	int done;
 	char chr;
 	smart_str tmp_response = {0};
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();//i think this is not needed - even the parameter */
 
 	done = FALSE;
 

ext/soap/php_http.h

@@ -1,12 +1,12 @@
 #ifndef PHP_HTTP_H
 #define PHP_HTTP_H
 
-void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, char *soapaction);
-void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len);
+void send_http_soap_request(zval *this_ptr, xmlDoc *doc, char *function_name, char *soapaction TSRMLS_DC);
+void get_http_soap_response(zval *this_ptr, char **buffer, int *buffer_len TSRMLS_DC);
 
 char *get_http_header_value(char *headers, char *type);
-int get_http_body(SOAP_STREAM socketd, char *headers,  char **response, int *out_size);
-int get_http_headers(SOAP_STREAM socketd,char **response, int *out_size);
+int get_http_body(SOAP_STREAM socketd, char *headers,  char **response, int *out_size TSRMLS_DC);
+int get_http_headers(SOAP_STREAM socketd,char **response, int *out_size TSRMLS_DC);
 
 #ifndef PHP_STREAMS
 #ifndef ZEND_WIN32

ext/soap/php_packet_soap.c

@@ -1,11 +1,11 @@
 #include "php_soap.h"
 
-int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunctionPtr fn, char *fn_name, zval ***ret, int *num_params)
+int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunctionPtr fn, char *fn_name, zval ***ret, int *num_params TSRMLS_DC)
 {
 	xmlDocPtr response;
 	xmlNodePtr trav, trav2, env, body, resp, cur, fault;
 	zval **tmp_ret;
-	TSRMLS_FETCH();
+/*	TSRMLS_FETCH();*/
 
 	response = xmlParseMemory(buffer, buffer_size);
 	xmlCleanupParser();
@@ -49,7 +49,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction
 					details = enc->to_zval(enc->details, tmp);
 				}
 
-				add_soap_fault(this_ptr, faultcode, faultstring, faultactor, details);
+				add_soap_fault(this_ptr, faultcode, faultstring, faultactor, details TSRMLS_CC);
 			}
 			else
 			{

ext/soap/php_packet_soap.h

@@ -1,6 +1,6 @@
 #ifndef PHP_PACKET_SOAP_H
 #define PHP_PACKET_SOAP_H
 
-int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunctionPtr fn, char *fn_name, zval ***ret, int *num_params);
+int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunctionPtr fn, char *fn_name, zval ***ret, int *num_params TSRMLS_DC);
 
 #endif

ext/soap/php_schema.c

@@ -848,7 +848,7 @@ int schema_element(sdlPtr *sdl, xmlAttrPtr tsn, xmlNodePtr element, sdlTypePtr c
 {
 	xmlNodePtr content;
 	xmlAttrPtr attrs, curattr, name, ns;
-	TSRMLS_FETCH();
+	TSRMLS_FETCH(); /* is this really needed - or the parameter */
 
 	attrs = element->properties;
 	ns = get_attribute(attrs, "targetNamespace");

ext/soap/php_soap.h

@@ -244,8 +244,8 @@ extern zend_class_entry soap_var_class_entry;
 PS_SERIALIZER_FUNCS(soap);
 
 void clear_soap_fault(zval *obj);
-void set_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail);
-void add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail);
+void set_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail TSRMLS_DC);
+void add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *fault_actor, zval *fault_detail TSRMLS_DC);
 
 sdlParamPtr get_param(sdlFunctionPtr function, char *param_name, int index, int);
 sdlFunctionPtr get_function(sdlBindingPtr sdl, char *function_name);
@@ -265,7 +265,7 @@ zval soap_get_property_handler(zend_property_reference *property_reference);
 int soap_set_property_handler(zend_property_reference *property_reference, zval *value);
 void soap_destructor(void *jobject);
 
-void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name, int *num_params, zval **parameters[]);
+void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name, int *num_params, zval **parameters[] TSRMLS_CC);
 xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name,char *uri,zval *ret);
 xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count);
 xmlNodePtr seralize_parameter(sdlParamPtr param,zval *param_val,int index,char *name, int style);