[PHP-CVS] cvs: php-src(PHP_5_1) /ext/soap php_encoding.c

[George Schlossnagle]

gschlossnagle           Fri Oct  7 01:14:52 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/soap   php_encoding.c 
  Log:
  Permit correct usage of inherited encoders (from restriction/extension  
  "base" directives) for xml response decoding.
  
  
  
  
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.4&r2=1.103.2.5&ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.4 
php-src/ext/soap/php_encoding.c:1.103.2.5
--- php-src/ext/soap/php_encoding.c:1.103.2.4   Thu Oct  6 18:30:24 2005
+++ php-src/ext/soap/php_encoding.c     Fri Oct  7 01:14:52 2005
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.103.2.4 2005/10/06 22:30:24 gschlossnagle Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.5 2005/10/07 05:14:52 gschlossnagle Exp $ */
 
 #include <time.h>
 
@@ -1185,9 +1185,9 @@
                if (sdlType->kind == XSD_TYPEKIND_RESTRICTION &&
                    sdlType->encode && type != &sdlType->encode->details) {
                        encodePtr enc;
-
                        enc = sdlType->encode;
                        while (enc && enc->details.sdl_type &&
+                              enc->details.sdl_type->kind != 
XSD_TYPEKIND_COMPLEX &&
                               enc->details.sdl_type->kind != 
XSD_TYPEKIND_SIMPLE &&
                               enc->details.sdl_type->kind != XSD_TYPEKIND_LIST 
&&
                               enc->details.sdl_type->kind != 
XSD_TYPEKIND_UNION) {
@@ -1210,6 +1210,7 @@
                           sdlType->encode &&
                           type != &sdlType->encode->details) {
                        if (sdlType->encode->details.sdl_type &&
+                           sdlType->encode->details.sdl_type->kind != 
XSD_TYPEKIND_COMPLEX &&
                            sdlType->encode->details.sdl_type->kind != 
XSD_TYPEKIND_SIMPLE &&
                            sdlType->encode->details.sdl_type->kind != 
XSD_TYPEKIND_LIST &&
                            sdlType->encode->details.sdl_type->kind != 
XSD_TYPEKIND_UNION) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php