archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Reverted last George patches

Browse source
This commit is contained in:
Dmitry Stogov 2005-10-07 08:21:37 +00:00
parent 83bb14d2ff
commit 5d4a602eaa
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/soap/php_encoding.c
View file

@ -319,10 +319,6 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par
node = encode->to_xml_after(&encode->details, node, style); node = encode->to_xml_after(&encode->details, node, style);
} }
} }
if(!node) {
node = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, node);
}
return node; return node;
} }
@ -1189,7 +1185,6 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
enc = sdlType->encode; enc = sdlType->encode;
while (enc && enc->details.sdl_type && 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_SIMPLE &&
enc->details.sdl_type->kind != XSD_TYPEKIND_LIST && enc->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) { enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@ -1212,7 +1207,6 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
sdlType->encode && sdlType->encode &&
type != &sdlType->encode->details) { type != &sdlType->encode->details) {
if (sdlType->encode->details.sdl_type && 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_SIMPLE &&
sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) { sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@ -1542,7 +1536,6 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
enc = sdlType->encode; enc = sdlType->encode;
while (enc && enc->details.sdl_type && 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_SIMPLE &&
enc->details.sdl_type->kind != XSD_TYPEKIND_LIST && enc->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) { enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@ -1552,8 +1545,11 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
zval *tmp = get_zval_property(data, "_" TSRMLS_CC); zval *tmp = get_zval_property(data, "_" TSRMLS_CC);
if (tmp) { if (tmp) {
xmlParam = master_to_xml(enc, tmp, style, parent); xmlParam = master_to_xml(enc, tmp, style, parent);
} else { } else if (prop == NULL) {
xmlParam = master_to_xml(enc, data, style, parent); xmlParam = master_to_xml(enc, data, style, parent);
} else {
xmlParam = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, xmlParam);
} }
} else { } else {
xmlParam = xmlNewNode(NULL,"BOGUS"); xmlParam = xmlNewNode(NULL,"BOGUS");
@ -1562,7 +1558,6 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION && } else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
sdlType->encode && type != &sdlType->encode->details) { sdlType->encode && type != &sdlType->encode->details) {
if (sdlType->encode->details.sdl_type && 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_SIMPLE &&
sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST && sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) { sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@ -1572,9 +1567,12 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
if (tmp) { if (tmp) {
xmlParam = master_to_xml(sdlType->encode, tmp, style, parent); xmlParam = master_to_xml(sdlType->encode, tmp, style, parent);
} else { } else if (prop == NULL) {
xmlParam = master_to_xml(sdlType->encode, data, style, parent); xmlParam = master_to_xml(sdlType->encode, data, style, parent);
} } else {
xmlParam = xmlNewNode(NULL,"BOGUS");
xmlAddChild(parent, xmlParam);
}
} }
} else { } else {
xmlParam = xmlNewNode(NULL,"BOGUS"); xmlParam = xmlNewNode(NULL,"BOGUS");