Skip to content

Commit 2c1b3b7

Browse files
author
Brad LaFountain
committed
changes in the past shouldn't have compiled.
1 parent fd40b6d commit 2c1b3b7

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

‎ext/soap/TODO

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ do some more work on website
3434

3535
does this list stop... what exactly have i done?
3636
im sure im forgetting 20 thousand more things....
37+
38+
39+
- brad

‎ext/soap/php_soap.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ zval soap_get_property_handler(zend_property_reference *property_reference);
269269
int soap_set_property_handler(zend_property_reference *property_reference, zval *value);
270270
void soap_destructor(void *jobject);
271271

272-
void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name, int *num_params, zval **parameters[] TSRMLS_CC);
273-
xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name,char *uri,zval *ret);
274-
xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count);
275-
xmlNodePtr seralize_parameter(sdlParamPtr param,zval *param_val,int index,char *name, int style);
276-
xmlNodePtr seralize_zval(zval *val, sdlParamPtr param, char *paramName, int style);
277-
zval *desearlize_zval(sdlPtr sdl, xmlNodePtr data, sdlParamPtr param);
272+
void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name, int *num_params, zval **parameters[] TSRMLS_DC);
273+
xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name,char *uri,zval *ret TSRMLS_DC);
274+
xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count TSRMLS_DC);
275+
xmlNodePtr seralize_parameter(sdlParamPtr param,zval *param_val,int index,char *name, int style TSRMLS_DC);
276+
xmlNodePtr seralize_zval(zval *val, sdlParamPtr param, char *paramName, int style TSRMLS_DC);
277+
zval *desearlize_zval(sdlPtr sdl, xmlNodePtr data, sdlParamPtr param TSRMLS_DC);
278278

279279
void soap_error_handler(int error_num, const char *error_filename, const uint error_lineno, const char *format, va_list args);
280280
#ifndef ZEND_ENGINE_2

‎ext/soap/soap.c

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ PHP_FUNCTION(handle)
925925
sprintf(response_name,"%sResponse\0",fn_name);
926926

927927
if(service->type == SOAP_CLASS)
928-
{
928+
{
929929
soap_obj = NULL;
930930
/* If persistent then set soap_obj from from the previous created session (if available) */
931931
if(service->soap_class.persistance == SOAP_PERSISTENCE_SESSION)
@@ -1029,7 +1029,7 @@ PHP_FUNCTION(handle)
10291029
sdlFunctionPtr function;
10301030
function = get_function(get_binding_from_type(service->sdl, BINDING_SOAP), Z_STRVAL(function_name));
10311031
SOAP_GLOBAL(overrides) = service->mapping;
1032-
doc_return = seralize_response_call(function, response_name, service->uri, &retval);
1032+
doc_return = seralize_response_call(function, response_name, service->uri, &retval TSRMLS_CC);
10331033
SOAP_GLOBAL(overrides) = NULL;
10341034
}
10351035
else
@@ -1111,7 +1111,7 @@ void soap_error_handler(int error_num, const char *error_filename, const uint er
11111111
php_end_ob_buffer(0, 0 TSRMLS_CC);
11121112

11131113
set_soap_fault(&ret, "SOAP-ENV:Server", buffer, NULL, &outbuf TSRMLS_CC);
1114-
doc_return = seralize_response_call(NULL, NULL, NULL, &ret);
1114+
doc_return = seralize_response_call(NULL, NULL, NULL, &ret TSRMLS_CC);
11151115

11161116
/* Build and send our headers + http 500 status */
11171117
/*
@@ -1283,11 +1283,11 @@ PHP_FUNCTION(__generate)
12831283

12841284
php_strtolower(function, function_len);
12851285
sdlFunction = get_function(binding, function);
1286-
request = seralize_function_call(this_ptr, sdlFunction, NULL, uri, real_args, arg_count);
1286+
request = seralize_function_call(this_ptr, sdlFunction, NULL, uri, real_args, arg_count TSRMLS_CC);
12871287
}
12881288
else
12891289
{
1290-
request = seralize_function_call(this_ptr, NULL, function, uri, real_args, arg_count);
1290+
request = seralize_function_call(this_ptr, NULL, function, uri, real_args, arg_count TSRMLS_CC);
12911291
}
12921292

12931293
xmlDocDumpMemory(request, &buf, &size);
@@ -1361,7 +1361,7 @@ PHP_FUNCTION(__call)
13611361
real_args[i++] = *param;
13621362
}
13631363

1364-
request = seralize_function_call(this_ptr, NULL, function, uri, real_args, arg_count);
1364+
request = seralize_function_call(this_ptr, NULL, function, uri, real_args, arg_count TSRMLS_CC);
13651365
send_http_soap_request(getThis(), request, function, soap_action TSRMLS_CC);
13661366
xmlFreeDoc(request);
13671367

@@ -1507,7 +1507,7 @@ void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
15071507
char *function = Z_STRVAL(function_name->element);
15081508
zend_function *builtin_function;
15091509

1510-
TSRMLS_FETCH();
1510+
// TSRMLS_FETCH();
15111511

15121512
GET_THIS_OBJECT(thisObj);
15131513

@@ -1550,12 +1550,12 @@ void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
15501550
if(binding->bindingType == BINDING_SOAP)
15511551
{
15521552
sdlSoapBindingFunctionPtr fnb = (sdlSoapBindingFunctionPtr)fn->bindingAttributes;
1553-
request = seralize_function_call(this_ptr, fn, NULL, fnb->input.ns, arguments, arg_count);
1553+
request = seralize_function_call(this_ptr, fn, NULL, fnb->input.ns, arguments, arg_count TSRMLS_CC);
15541554
send_http_soap_request(getThis(), request, fn->functionName, fnb->soapAction TSRMLS_CC);
15551555
}
15561556
else
15571557
{
1558-
request = seralize_function_call(this_ptr, fn, NULL, sdl->target_ns, arguments, arg_count);
1558+
request = seralize_function_call(this_ptr, fn, NULL, sdl->target_ns, arguments, arg_count TSRMLS_CC);
15591559
send_http_soap_request(getThis(), request, fn->functionName, NULL TSRMLS_CC);
15601560
}
15611561

@@ -1591,7 +1591,7 @@ void soap_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_refe
15911591
if(zend_hash_find(Z_OBJPROP_P(thisObj), "uri", sizeof("uri"), (void *)&uri) == FAILURE)
15921592
php_error(E_ERROR, "Error finding uri in soap_call_function_handler");
15931593

1594-
request = seralize_function_call(this_ptr, NULL, function, Z_STRVAL_PP(uri), arguments, arg_count);
1594+
request = seralize_function_call(this_ptr, NULL, function, Z_STRVAL_PP(uri), arguments, arg_count TSRMLS_CC);
15951595
action = build_soap_action(thisObj, function);
15961596
send_http_soap_request(getThis(), request, function, action->c TSRMLS_CC);
15971597

@@ -1734,7 +1734,7 @@ void deseralize_function_call(sdlPtr sdl, xmlDocPtr request, zval *function_name
17341734
ENDFOREACH(trav);
17351735
}
17361736

1737-
xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name, char *uri, zval *ret)
1737+
xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name, char *uri, zval *ret TSRMLS_DC)
17381738
{
17391739
xmlDoc *doc;
17401740
xmlNode *envelope,*body,*method, *param;
@@ -1762,7 +1762,7 @@ xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name, c
17621762
if(Z_TYPE_P(ret) == IS_OBJECT &&
17631763
Z_OBJCE_P(ret)->refcount == soap_fault_class_entry.refcount)
17641764
{
1765-
param = seralize_zval(ret, NULL, "SOAP-ENV:Fault", SOAP_ENCODED);
1765+
param = seralize_zval(ret, NULL, "SOAP-ENV:Fault", SOAP_ENCODED TSRMLS_CC);
17661766
xmlAddChild(body, param);
17671767
}
17681768
else
@@ -1788,20 +1788,20 @@ xmlDocPtr seralize_response_call(sdlFunctionPtr function, char *function_name, c
17881788

17891789
if(zend_hash_find(Z_OBJPROP_P(ret), "param_name", sizeof("param_name"), (void **)&ret_name) == SUCCESS &&
17901790
zend_hash_find(Z_OBJPROP_P(ret), "param_data", sizeof("param_data"), (void **)&ret_data) == SUCCESS)
1791-
param = seralize_parameter(parameter, *ret_data, 0, Z_STRVAL_PP(ret_name), SOAP_ENCODED);
1791+
param = seralize_parameter(parameter, *ret_data, 0, Z_STRVAL_PP(ret_name), SOAP_ENCODED TSRMLS_CC);
17921792
else
1793-
param = seralize_parameter(parameter, ret, 0, "return", SOAP_ENCODED);
1793+
param = seralize_parameter(parameter, ret, 0, "return", SOAP_ENCODED TSRMLS_CC);
17941794
}
17951795
else
1796-
param = seralize_parameter(parameter, ret, 0, "return", SOAP_ENCODED);
1796+
param = seralize_parameter(parameter, ret, 0, "return", SOAP_ENCODED TSRMLS_CC);
17971797

17981798
xmlAddChild(method,param);
17991799
}
18001800

18011801
return doc;
18021802
}
18031803

1804-
xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count)
1804+
xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *function_name, char *uri, zval **arguments, int arg_count TSRMLS_DC)
18051805
{
18061806
xmlDoc *doc;
18071807
xmlNode *envelope, *body, *method;
@@ -1874,12 +1874,12 @@ xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *
18741874

18751875
if(zend_hash_find(Z_OBJPROP_P(arguments[i]), "param_name", sizeof("param_name"), (void **)&ret_name) == SUCCESS &&
18761876
zend_hash_find(Z_OBJPROP_P(arguments[i]), "param_data", sizeof("param_data"), (void **)&ret_data) == SUCCESS)
1877-
param = seralize_parameter(parameter, *ret_data, i, Z_STRVAL_PP(ret_name), use);
1877+
param = seralize_parameter(parameter, *ret_data, i, Z_STRVAL_PP(ret_name), use TSRMLS_CC);
18781878
else
1879-
param = seralize_parameter(parameter, arguments[i], i, NULL, use);
1879+
param = seralize_parameter(parameter, arguments[i], i, NULL, use TSRMLS_CC);
18801880
}
18811881
else
1882-
param = seralize_parameter(parameter, arguments[i], i, NULL, use);
1882+
param = seralize_parameter(parameter, arguments[i], i, NULL, use TSRMLS_CC);
18831883

18841884
if(style == SOAP_RPC)
18851885
xmlAddChild(method, param);
@@ -1904,7 +1904,7 @@ xmlDocPtr seralize_function_call(zval *this_ptr, sdlFunctionPtr function, char *
19041904
return doc;
19051905
}
19061906

1907-
xmlNodePtr seralize_parameter(sdlParamPtr param, zval *param_val, int index, char *name, int style)
1907+
xmlNodePtr seralize_parameter(sdlParamPtr param, zval *param_val, int index, char *name, int style TSRMLS_DC)
19081908
{
19091909
int type = 0;
19101910
char *paramName;
@@ -1923,17 +1923,16 @@ xmlNodePtr seralize_parameter(sdlParamPtr param, zval *param_val, int index, cha
19231923
paramName = estrdup(name);
19241924
}
19251925

1926-
xmlParam = seralize_zval(param_val, param, paramName, style);
1926+
xmlParam = seralize_zval(param_val, param, paramName, style TSRMLS_CC);
19271927

19281928
efree(paramName);
19291929

19301930
return xmlParam;
19311931
}
19321932

1933-
zval *desearlize_zval(sdlPtr sdl, xmlNodePtr data, sdlParamPtr param)
1933+
zval *desearlize_zval(sdlPtr sdl, xmlNodePtr data, sdlParamPtr param TSRMLS_DC)
19341934
{
19351935
encodePtr enc;
1936-
/* TSRMLS_FETCH(); //think not needed */
19371936

19381937
if(param != NULL)
19391938
enc = param->encode;
@@ -1943,11 +1942,10 @@ zval *desearlize_zval(sdlPtr sdl, xmlNodePtr data, sdlParamPtr param)
19431942
return enc->to_zval(enc->details, data);
19441943
}
19451944

1946-
xmlNodePtr seralize_zval(zval *val, sdlParamPtr param, char *paramName, int style)
1945+
xmlNodePtr seralize_zval(zval *val, sdlParamPtr param, char *paramName, int style TSRMLS_DC)
19471946
{
19481947
xmlNodePtr xmlParam;
19491948
encodePtr enc;
1950-
/* TSRMLS_FETCH(); //think not needed */
19511949

19521950
if(param != NULL)
19531951
enc = param->encode;

0 commit comments

Comments
 (0)