diff options
Diffstat (limited to 'it_url.class')
| -rw-r--r-- | it_url.class | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/it_url.class b/it_url.class index b38eaf1..a0ba77f 100644 --- a/it_url.class +++ b/it_url.class @@ -108,7 +108,7 @@ static function _postprocess($data, $p) * @param $p['safety'] DEPRECATED. 0 = ignore errors, 1 = errors, 2 = fatals * @param $p['it_error'] extra arguments for it_error or false to ignore errors * @param $p['fetchsleep'] Number of seconds to wait after fetch, fractions ok - * @param $p['body_on_fail'] Return body of page even if http status code is >= 400 + * @param $p['body_on_fail'] Return body of page even if http status code is >= 400, e.g. some JSON APIs return 404 with JSON data * * Result processing * @param $p['assoc'] Return [ 'data' => string, 'status' => int, 'cookies' => array, 'headers' => array, 'errstr' => string ] instead of just data @@ -360,11 +360,7 @@ function request($p=array()) } else { - # FIXME 2024-06 CS Send a notice in cases where changing the default to body_on_fail=false would change result for text results - if ($url->result >= 400 && $url->data && !$p['assoc'] && !isset($p['body_on_fail']) && it::match('^text/', $url->headers['Content-Type'])) - it::error(['to' => 'schneider@search.ch', 'title' => 'Failing it_url::get() without body_on_fail but non-empty data', 'body' => ['p' => $p, 'url' => $url]]); - - if ($url->result >= 400 && ((isset($p['body_on_fail']) && !$p['body_on_fail']) || $p['empty_on_fail'] || $p['keepfailed'])) # FIXME 2024-06 CS Remove deprecated empty_on_fail support + if ($url->result >= 400 && (!$p['body_on_fail'] || $p['keepfailed'])) $got = $url->data = false; $result =& $url->data; $this->errstr = "HTTP Status " . $url->result; |