kalle Wed Apr 1 09:38:42 2009 UTC
Modified files:
/php-src/ext/soap php_packet_soap.c
Log:
Fixed Windows build
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_packet_soap.c?r1=1.56&r2=1.57&diff_format=u
Index: php-src/ext/soap/php_packet_soap.c
diff -u php-src/ext/soap/php_packet_soap.c:1.56
php-src/ext/soap/php_packet_soap.c:1.57
--- php-src/ext/soap/php_packet_soap.c:1.56 Thu Mar 26 20:02:12 2009
+++ php-src/ext/soap/php_packet_soap.c Wed Apr 1 09:38:41 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov <[email protected]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_packet_soap.c,v 1.56 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: php_packet_soap.c,v 1.57 2009/04/01 09:38:41 kalle Exp $ */
#include "php_soap.h"
@@ -256,6 +256,10 @@
res_count =
zend_hash_num_elements(fn->responseParameters);
zend_hash_internal_pointer_reset(fn->responseParameters);
while
(zend_hash_get_current_data(fn->responseParameters, (void **)&h_param) ==
SUCCESS) {
+ UErrorCode status = U_ZERO_ERROR;
+ zstr u_name;
+ int u_name_len;
+
param = (*h_param);
if (fnb->style == SOAP_DOCUMENT) {
if (param->element) {
@@ -318,9 +322,6 @@
tmp =
master_to_zval(NULL, val);
}
}
- UErrorCode status = U_ZERO_ERROR;
- zstr u_name;
- int u_name_len;
zend_string_to_unicode_ex(UG(utf8_conv), &u_name.u, &u_name_len,
param->paramName, strlen(param->paramName), &status);
add_u_assoc_zval_ex(return_value,
IS_UNICODE, u_name, u_name_len+1, tmp);
efree(u_name.u);
@@ -396,6 +397,9 @@
if (trav->type == XML_ELEMENT_NODE) {
encodePtr enc = NULL;
zval* val;
+ UErrorCode status = U_ZERO_ERROR;
+ zstr u_name;
+ int u_name_len;
if (hdrs) {
smart_str key = {0};
@@ -413,9 +417,6 @@
smart_str_free(&key);
}
val = master_to_zval(enc, trav);
- UErrorCode status = U_ZERO_ERROR;
- zstr u_name;
- int u_name_len;
zend_string_to_unicode_ex(UG(utf8_conv),
&u_name.u, &u_name_len, (char*)trav->name, strlen((char*)trav->name), &status);
add_u_assoc_zval_ex(soap_headers, IS_UNICODE,
u_name, u_name_len+1, val);
efree(u_name.u);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
