denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

curl: Be less strict when considering status codes as errors

Browse Source 
For file:// URIs the code is 0 on success. We now do the same libcurl
would do with CURLOPT_FAILONERROR enabled.

Fixes #1203.
This commit is contained in:
Tobias Brunner
2015-11-12 14:40:37 +01:00
parent fdfbd401c3
commit 15d715dace
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/curl/curl_fetcher.c
+3 -3
View File
@@ -123,7 +123,7 @@ METHOD(fetcher_t, fetch, status_t,
curl_easy_setopt(this->curl, CURLOPT_HTTPHEADER, this->headers); curl_easy_setopt(this->curl, CURLOPT_HTTPHEADER, this->headers);
} }
DBG2(DBG_LIB, " sending http request to '%s'...", uri); DBG2(DBG_LIB, " sending request to '%s'...", uri);
curl_status = curl_easy_perform(this->curl); curl_status = curl_easy_perform(this->curl);
switch (curl_status) switch (curl_status)
{ {
@@ -137,10 +137,10 @@ METHOD(fetcher_t, fetch, status_t,
{ {
*this->result = result; *this->result = result;
} }
status = (result >= 200 && result < 300) ? SUCCESS : FAILED; status = (result < 400) ? SUCCESS : FAILED;
break; break;
default: default:
DBG1(DBG_LIB, "libcurl http request failed [%d]: %s", curl_status, DBG1(DBG_LIB, "libcurl request failed [%d]: %s", curl_status,
error); error);
status = FAILED; status = FAILED;
break; break;