diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-01-15 10:59:24 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-01-15 10:59:24 +0000 |
| commit | ef9e73459376b23a268ffaa7f71877cac5851c45 (patch) | |
| tree | 0468eb9fb2d5b894925183a76eba5b740f8a4e1c /ext/soap/php_packet_soap.c | |
| parent | 43b0a9e96b6b0e201980efea5077d86699d95a52 (diff) | |
| download | php-git-ef9e73459376b23a268ffaa7f71877cac5851c45.tar.gz | |
SOAP 1.2 support was improved
Diffstat (limited to 'ext/soap/php_packet_soap.c')
| -rw-r--r-- | ext/soap/php_packet_soap.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/soap/php_packet_soap.c b/ext/soap/php_packet_soap.c index cc5a352bc2..4fa122e3bd 100644 --- a/ext/soap/php_packet_soap.c +++ b/ext/soap/php_packet_soap.c @@ -21,11 +21,11 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction EG(error_reporting) = old_error_reporting; if (!response) { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "looks like we got no XML document", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "looks like we got no XML document", NULL, NULL TSRMLS_CC); return FALSE; } if (xmlGetIntSubset(response) != NULL) { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "DTD are not supported by SOAP", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "DTD are not supported by SOAP", NULL, NULL TSRMLS_CC); return FALSE; } @@ -34,14 +34,14 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction trav = response->children; while (trav != NULL) { if (trav->type == XML_ELEMENT_NODE) { - if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_1_ENV)) { + if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_1_ENV_NAMESPACE)) { env = trav; - envelope_ns = SOAP_1_1_ENV; - } else if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_2_ENV)) { + envelope_ns = SOAP_1_1_ENV_NAMESPACE; + } else if (env == NULL && node_is_equal_ex(trav,"Envelope",SOAP_1_2_ENV_NAMESPACE)) { env = trav; - envelope_ns = SOAP_1_2_ENV; + envelope_ns = SOAP_1_2_ENV_NAMESPACE; } else { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "looks like we got bad SOAP response\n", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "looks like we got bad SOAP response\n", NULL, NULL TSRMLS_CC); xmlFreeDoc(response); return FALSE; } @@ -49,7 +49,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction trav = trav->next; } if (env == NULL) { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "looks like we got XML without \"Envelope\" element\n", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "looks like we got XML without \"Envelope\" element\n", NULL, NULL TSRMLS_CC); xmlFreeDoc(response); return FALSE; } @@ -72,7 +72,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction if (body == NULL && node_is_equal_ex(trav,"Body",envelope_ns)) { body = trav; } else { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "looks like we got bad SOAP response\n", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "looks like we got bad SOAP response\n", NULL, NULL TSRMLS_CC); xmlFreeDoc(response); return FALSE; } @@ -80,7 +80,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction trav = trav->next; } if (body == NULL) { - add_soap_fault(this_ptr, "SOAP-ENV:Client", "looks like we got \"Envelope\" without \"Body\" element\n", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "looks like we got \"Envelope\" without \"Body\" element\n", NULL, NULL TSRMLS_CC); xmlFreeDoc(response); return FALSE; } @@ -171,7 +171,7 @@ int parse_packet_soap(zval *this_ptr, char *buffer, int buffer_size, sdlFunction MAKE_STD_ZVAL(tmp); ZVAL_NULL(tmp); /* - add_soap_fault(this_ptr, "SOAP-ENV:Client", "Can't find response data", NULL, NULL TSRMLS_CC); + add_soap_fault(this_ptr, "Client", "Can't find response data", NULL, NULL TSRMLS_CC); xmlFreeDoc(response); return FALSE; */ |