cvs: php-src(PHP_5_0) / NEWS /ext/soap php_http.c soap.c

dmitry Thu Nov 4 10:29:54 2004 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/soap php_http.c soap.c Log: Fixed bug #30685 (Malformed SOAPClient http header reequest). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.114&r2=1.1760.2.115&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.114 php-src/NEWS:1.1760.2.115 --- php-src/NEWS:1.1760.2.114 Tue Nov 2 11:42:46 2004 +++ php-src/NEWS Thu Nov 4 10:29:53 2004 @@ -1,6 +1,7 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2004, PHP 5.0.3 +- Fixed bug #30685 (Malformed SOAPClient http header reequest). (Dmitry) - Fixed bug #30645 (def. multi result set support for mysql_connect). (Georg) - Fixed error handling in mysqli_multi_query. (Georg) - Fixed a problem with SPL iterators aggregating the innner iterator. (Marcus) http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.55.2.1&r2=1.55.2.2&ty=u Index: php-src/ext/soap/php_http.c diff -u php-src/ext/soap/php_http.c:1.55.2.1 php-src/ext/soap/php_http.c:1.55.2.2 --- php-src/ext/soap/php_http.c:1.55.2.1 Tue Sep 28 05:13:36 2004 +++ php-src/ext/soap/php_http.c Thu Nov 4 10:29:54 2004 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_http.c,v 1.55.2.1 2004/09/28 09:13:36 wez Exp $ */ +/* $Id: php_http.c,v 1.55.2.2 2004/11/04 15:29:54 dmitry Exp $ */ #include "php_soap.h" #include "ext/standard/base64.h" @@ -388,14 +388,15 @@ */ "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); http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.9&r2=1.110.2.10&ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.110.2.9 php-src/ext/soap/soap.c:1.110.2.10 --- php-src/ext/soap/soap.c:1.110.2.9 Thu Sep 16 04:11:07 2004 +++ php-src/ext/soap/soap.c Thu Nov 4 10:29:54 2004 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: soap.c,v 1.110.2.9 2004/09/16 08:11:07 dmitry Exp $ */ +/* $Id: soap.c,v 1.110.2.10 2004/11/04 15:29:54 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1296,7 +1296,7 @@ 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, &param TSRMLS_CC) == FAILURE) { @@ -1312,7 +1312,7 @@ } 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 @@ 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 @@ 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);