dmitry Thu Oct 16 15:49:39 2008 UTC
Modified files:
/php-src/ext/soap php_encoding.c
Log:
ws
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.170&r2=1.171&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.170
php-src/ext/soap/php_encoding.c:1.171
--- php-src/ext/soap/php_encoding.c:1.170 Thu Oct 16 15:37:11 2008
+++ php-src/ext/soap/php_encoding.c Thu Oct 16 15:49:38 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.170 2008/10/16 15:37:11 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.171 2008/10/16 15:49:38 dmitry Exp $ */
#include <time.h>
@@ -471,27 +471,27 @@
zend_uchar utype =
zend_hash_get_current_key_ex(SOAP_GLOBAL(class_map), &type_name, &type_len,
&idx, 0, &pos);
- if (utype == HASH_KEY_IS_STRING || utype ==
HASH_KEY_IS_UNICODE) {
- encodePtr enc = NULL;
+ if (utype == HASH_KEY_IS_STRING ||
utype == HASH_KEY_IS_UNICODE) {
+ encodePtr enc = NULL;
- type_name.s =
soap_encode_string_ex(utype, type_name, type_len TSRMLS_CC);
+ type_name.s =
soap_encode_string_ex(utype, type_name, type_len TSRMLS_CC);
- /* TODO: namespace isn't stored */
- if (SOAP_GLOBAL(sdl)) {
- enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name.s);
- if (!enc) {
- enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
- }
- }
- if (enc) {
- if (encode != enc && style ==
SOAP_LITERAL) {
+ /* TODO: namespace isn't stored
*/
+ if (SOAP_GLOBAL(sdl)) {
+ enc =
get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name.s);
+ if (!enc) {
+ enc =
find_encoder_by_type_name(SOAP_GLOBAL(sdl), type_name.s);
+ }
+ }
+ if (enc) {
+ if (encode != enc &&
style == SOAP_LITERAL) {
add_type = 1;
- }
- encode = enc;
+ }
+ encode = enc;
}
efree(type_name.v);
- break;
- }
+ break;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
