diff options
| author | Dmitry Stogov <dmitry@php.net> | 2004-11-04 15:30:28 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2004-11-04 15:30:28 +0000 |
| commit | 75c2a2e527ff6a3ee925e83ee7f93d1e7c31478d (patch) | |
| tree | 8c9a891277032a1b6cb9762a8f7569aecd1a7c3b | |
| parent | d2b5b62af5286b4fa42a10e45093998cdef551b8 (diff) | |
| download | php-git-75c2a2e527ff6a3ee925e83ee7f93d1e7c31478d.tar.gz | |
Fixed bug #30685 (Malformed SOAPClient http header reequest).
| -rw-r--r-- | ext/soap/php_http.c | 9 | ||||
| -rw-r--r-- | ext/soap/soap.c | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 9c4d47624c..ed2813abb7 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -388,14 +388,15 @@ try_again: */ "User-Agent: PHP SOAP 0.1\r\n"); if (soap_version == SOAP_1_2) { - smart_str_append_const(&soap_headers,"Content-Type: application/soap+xml; charset=\"utf-8"); + smart_str_append_const(&soap_headers,"Content-Type: application/soap+xml; charset=utf-8"); if (soapaction) { - smart_str_append_const(&soap_headers,"\"; action=\""); + smart_str_append_const(&soap_headers,"; action=\""); smart_str_appends(&soap_headers, soapaction); + smart_str_append_const(&soap_headers,"\""); } - smart_str_append_const(&soap_headers,"\"\r\n"); + smart_str_append_const(&soap_headers,"\r\n"); } else { - smart_str_append_const(&soap_headers,"Content-Type: text/xml; charset=\"utf-8\"\r\n"); + smart_str_append_const(&soap_headers,"Content-Type: text/xml; charset=utf-8\r\n"); if (soapaction) { smart_str_append_const(&soap_headers, "SOAPAction: \""); smart_str_appends(&soap_headers, soapaction); diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 53486966d7..5038f9da18 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1296,7 +1296,7 @@ PHP_METHOD(SoapServer, handle) INIT_ZVAL(readfile_ret); MAKE_STD_ZVAL(param); - sapi_add_header("Content-Type: text/xml; charset=\"utf-8\"", sizeof("Content-Type: text/xml; charset=\"utf-8\"")-1, 1); + sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1); ZVAL_STRING(param, service->sdl->source, 1); ZVAL_STRING(&readfile, "readfile", 1); if (call_user_function(EG(function_table), NULL, &readfile, &readfile_ret, 1, ¶m TSRMLS_CC) == FAILURE) { @@ -1312,7 +1312,7 @@ PHP_METHOD(SoapServer, handle) } else { soap_server_fault("Server", "WSDL generation is not supported yet", NULL, NULL, NULL TSRMLS_CC); /* - sapi_add_header("Content-Type: text/xml; charset=\"utf-8\"", sizeof("Content-Type: text/xml; charset=\"utf-8\""), 1); + sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8"), 1); PUTS("<?xml version=\"1.0\" ?>\n<definitions\n"); PUTS(" xmlns=\"http://schemas.xmlsoap.org/wsdl/\"\n"); PUTS(" targetNamespace=\""); @@ -1661,9 +1661,9 @@ PHP_METHOD(SoapServer, handle) sprintf(cont_len, "Content-Length: %d", size); sapi_add_header(cont_len, strlen(cont_len), 1); if (soap_version == SOAP_1_2) { - sapi_add_header("Content-Type: application/soap+xml; charset=\"utf-8\"", sizeof("Content-Type: application/soap+xml; charset=\"utf-8\"")-1, 1); + sapi_add_header("Content-Type: application/soap+xml; charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1, 1); } else { - sapi_add_header("Content-Type: text/xml; charset=\"utf-8\"", sizeof("Content-Type: text/xml; charset=\"utf-8\"")-1, 1); + sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1); } xmlFreeDoc(doc_return); @@ -1748,9 +1748,9 @@ static void soap_server_fault_ex(sdlFunctionPtr function, zval* fault, soapHeade sprintf(cont_len,"Content-Length: %d", size); sapi_add_header(cont_len, strlen(cont_len), 1); if (soap_version == SOAP_1_2) { - sapi_add_header("Content-Type: application/soap+xml; charset=\"utf-8\"", sizeof("Content-Type: application/soap+xml; charset=\"utf-8\"")-1, 1); + sapi_add_header("Content-Type: application/soap+xml; charset=utf-8", sizeof("Content-Type: application/soap+xml; charset=utf-8")-1, 1); } else { - sapi_add_header("Content-Type: text/xml; charset=\"utf-8\"", sizeof("Content-Type: text/xml; charset=\"utf-8\"")-1, 1); + sapi_add_header("Content-Type: text/xml; charset=utf-8", sizeof("Content-Type: text/xml; charset=utf-8")-1, 1); } php_write(buf, size TSRMLS_CC); |