diff options
author | Siemenskun <[email protected]> | 2022-05-22 01:46:46 +0300 |
---|---|---|
committer | Siemenskun <[email protected]> | 2022-05-22 01:46:46 +0300 |
commit | d33d026b12be0661b7fb79b13c74ebd031cab4d8 (patch) | |
tree | b899b33ecb320797f80e44e10df0b52459250e6d | |
parent | 659ad8537aea6681d27b2c87aa87aabfdfe67664 (diff) |
Fix xml parsing error
Move re-requesting logic before parsing response body, otherwise it puts HTTP headers into XML body
-rw-r--r-- | classes/urlhelper.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/urlhelper.php b/classes/urlhelper.php index 83f66a810..637ad1a44 100644 --- a/classes/urlhelper.php +++ b/classes/urlhelper.php @@ -394,6 +394,11 @@ class UrlHelper { $ret = @curl_exec($ch); + if (curl_errno($ch) === 23 || curl_errno($ch) === 61) { + curl_setopt($ch, CURLOPT_ENCODING, 'none'); + $contents = @curl_exec($ch); + } + $headers_length = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $headers = explode("\r\n", substr($ret, 0, $headers_length)); $contents = substr($ret, $headers_length); @@ -413,11 +418,6 @@ class UrlHelper { } } - if (curl_errno($ch) === 23 || curl_errno($ch) === 61) { - curl_setopt($ch, CURLOPT_ENCODING, 'none'); - $contents = @curl_exec($ch); - } - $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); self::$fetch_last_content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); |