Cadoles
/
BeSimpleSoap
20
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop'

This commit is contained in:
Petr Bechyně 2017-02-18 00:14:21 +01:00
parent a76526a5b6 f276a30a47
commit cf6e147c26
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BeSimple/SoapClient/Curl/Curl.php
View File

@ -158,7 +158,7 @@ class Curl
$location $location
); );
if (!is_integer($httpResponseCode) || $httpResponseCode >= 400) { if (!is_integer($httpResponseCode) || $httpResponseCode >= 400 || $httpResponseCode === 0) {
return new CurlResponse( return new CurlResponse(
$httpRequestHeadersAsString, $httpRequestHeadersAsString,

2
src/BeSimple/SoapClient/WsdlDownloader.php
View File

@ -75,7 +75,7 @@ class WsdlDownloader
$curlResponse = $curl->executeCurlWithCachedSession($wsdlPath); $curlResponse = $curl->executeCurlWithCachedSession($wsdlPath);
if ($curlResponse->curlStatusSuccess()) { if ($curlResponse->curlStatusSuccess()) {
if (mb_strlen($curlResponse->getResponseBody()) === 0) { if (mb_strlen($curlResponse->getResponseBody()) === 0) {
throw new Exception('Could not write WSDL cache file: curl response empty'); throw new Exception('Could not write WSDL cache file: empty curl response from: '.$wsdlPath);
} }
if ($resolveRemoteIncludes === true) { if ($resolveRemoteIncludes === true) {
$document = $this->getXmlFileDOMDocument($curl, $cacheType, $curlResponse->getResponseBody(), $wsdlPath); $document = $this->getXmlFileDOMDocument($curl, $cacheType, $curlResponse->getResponseBody(), $wsdlPath);

3
src/BeSimple/SoapCommon/Mime/Parser.php
View File

@ -110,7 +110,8 @@ class Parser
} }
if (strpos($currentHeader, ':') !== false) { if (strpos($currentHeader, ':') !== false) {
list($headerName, $headerValue) = explode(':', $currentHeader, 2); list($headerName, $headerValue) = explode(':', $currentHeader, 2);
$headerValue = iconv_mime_decode($headerValue, 0, Part::CHARSET_UTF8); $headerValueWithNoCrAtTheEnd = trim($headerValue);
$headerValue = iconv_mime_decode($headerValueWithNoCrAtTheEnd, 0, Part::CHARSET_UTF8);
$parsedMimeHeaders = ContentTypeParser::parseContentTypeHeader($headerName, $headerValue); $parsedMimeHeaders = ContentTypeParser::parseContentTypeHeader($headerName, $headerValue);
foreach ($parsedMimeHeaders as $parsedMimeHeader) { foreach ($parsedMimeHeaders as $parsedMimeHeader) {
$currentPart->setHeader( $currentPart->setHeader(