* depending on how authentication is working. Other codes
* are definitely errors, so give up here.
*/
- if(data->set.http_fail_on_error && (k->httpcode >= 400) &&
+ if(data->state.resume_from && data->set.httpreq == HTTPREQ_GET &&
+ k->httpcode == 416) {
+ /* "Requested Range Not Satisfiable", just proceed and
+ pretend this is no error */
+ k->ignorebody = TRUE; /* Avoid appending error msg to good data. */
+ }
+ else if(data->set.http_fail_on_error && (k->httpcode >= 400) &&
((k->httpcode != 401) || !conn->bits.user_passwd) &&
((k->httpcode != 407) || !conn->bits.proxy_user_passwd) ) {
-
- if(data->state.resume_from &&
- (data->set.httpreq == HTTPREQ_GET) &&
- (k->httpcode == 416)) {
- /* "Requested Range Not Satisfiable", just proceed and
- pretend this is no error */
- }
- else {
- /* serious error, go home! */
- print_http_error(data);
- return CURLE_HTTP_RETURNED_ERROR;
- }
+ /* serious error, go home! */
+ print_http_error(data);
+ return CURLE_HTTP_RETURNED_ERROR;
}
if(conn->httpversion == 10) {
--- /dev/null
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+#include "test.h"
+
+/*
+ Check range/resume returned error codes and data presence.
+
+ The input parameters are:
+ - CURLOPT_RANGE/CURLOPT_RESUME_FROM
+ - CURLOPT_FAILONERROR
+ - Returned http code (2xx/416)
+ - Content-Range header present in reply.
+
+*/
+
+#include "memdebug.h"
+
+#define F_RESUME (1 << 0) /* resume/range. */
+#define F_HTTP416 (1 << 1) /* Server returns http code 416. */
+#define F_FAIL (1 << 2) /* Fail on error. */
+#define F_CONTENTRANGE (1 << 3) /* Server sends content-range hdr. */
+#define F_IGNOREBODY (1 << 4) /* Body should be ignored. */
+
+typedef struct {
+ unsigned int flags; /* ORed flags as above. */
+ CURLcode result; /* Code that should be returned by curl_easy_perform(). */
+} testparams;
+
+static const testparams params[] = {
+ { 0, CURLE_OK },
+ { F_CONTENTRANGE, CURLE_OK },
+ { F_FAIL, CURLE_OK },
+ { F_FAIL | F_CONTENTRANGE, CURLE_OK },
+ { F_HTTP416, CURLE_OK },
+ { F_HTTP416 | F_CONTENTRANGE, CURLE_OK },
+ { F_HTTP416 | F_FAIL | F_IGNOREBODY,
+ CURLE_HTTP_RETURNED_ERROR },
+ { F_HTTP416 | F_FAIL | F_CONTENTRANGE | F_IGNOREBODY,
+ CURLE_HTTP_RETURNED_ERROR },
+ { F_RESUME | F_IGNOREBODY,
+ CURLE_RANGE_ERROR },
+ { F_RESUME | F_CONTENTRANGE, CURLE_OK },
+ { F_RESUME | F_FAIL | F_IGNOREBODY,
+ CURLE_RANGE_ERROR },
+ { F_RESUME | F_FAIL | F_CONTENTRANGE, CURLE_OK },
+ { F_RESUME | F_HTTP416 | F_IGNOREBODY, CURLE_OK },
+ { F_RESUME | F_HTTP416 | F_CONTENTRANGE | F_IGNOREBODY, CURLE_OK },
+ { F_RESUME | F_HTTP416 | F_FAIL | F_IGNOREBODY,
+ CURLE_HTTP_RETURNED_ERROR },
+ { F_RESUME | F_HTTP416 | F_FAIL | F_CONTENTRANGE | F_IGNOREBODY,
+ CURLE_HTTP_RETURNED_ERROR }
+};
+
+static int hasbody;
+
+static size_t writedata(char *data, size_t size, size_t nmemb, void *userdata)
+{
+ (void) data;
+ (void) userdata;
+
+ if(size && nmemb)
+ hasbody = 1;
+ return size * nmemb;
+}
+
+static int onetest(CURL *curl, const char *url, const testparams *p)
+{
+ CURLcode res;
+ unsigned int replyselector;
+ char urlbuf[256];
+
+ replyselector = p->flags & F_CONTENTRANGE? 1: 0;
+ if(p->flags & F_HTTP416)
+ replyselector += 2;
+ snprintf(urlbuf, sizeof(urlbuf), "%s%04u", url, replyselector);
+ test_setopt(curl, CURLOPT_URL, urlbuf);
+ test_setopt(curl, CURLOPT_RESUME_FROM, (p->flags & F_RESUME)? 3: 0);
+ test_setopt(curl, CURLOPT_RANGE, !(p->flags & F_RESUME)?
+ "3-1000000": (char *) NULL);
+ test_setopt(curl, CURLOPT_FAILONERROR, p->flags & F_FAIL? 1: 0);
+ hasbody = 0;
+ res = curl_easy_perform(curl);
+ if(res != p->result) {
+ fprintf(stderr, "bad error code (%d): resume=%s, fail=%s, http416=%s, "
+ "content-range=%s, expected=%d\n", res,
+ (p->flags & F_RESUME)? "yes": "no",
+ (p->flags & F_FAIL)? "yes": "no",
+ (p->flags & F_HTTP416)? "yes": "no",
+ (p->flags & F_CONTENTRANGE)? "yes": "no",
+ p->result);
+ return 1;
+ }
+ if(hasbody && (p->flags & F_IGNOREBODY)) {
+ fprintf(stderr, "body should be ignored and is not: resume=%s, fail=%s, "
+ "http416=%s, content-range=%s\n",
+ (p->flags & F_RESUME)? "yes": "no",
+ (p->flags & F_FAIL)? "yes": "no",
+ (p->flags & F_HTTP416)? "yes": "no",
+ (p->flags & F_CONTENTRANGE)? "yes": "no");
+ return 1;
+ }
+ return 0;
+
+ test_cleanup:
+
+ return 1;
+}
+
+int test(char *URL)
+{
+ CURLcode res;
+ CURL *curl;
+ size_t i;
+ int status = 0;
+
+ if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+ fprintf(stderr, "curl_global_init() failed\n");
+ return TEST_ERR_MAJOR_BAD;
+ }
+
+ curl = curl_easy_init();
+ if(!curl) {
+ fprintf(stderr, "curl_easy_init() failed\n");
+ curl_global_cleanup();
+ return TEST_ERR_MAJOR_BAD;
+ }
+
+ test_setopt(curl, CURLOPT_WRITEFUNCTION, writedata);
+
+ for(i = 0; i < sizeof(params) / sizeof(params[0]); i++)
+ status |= onetest(curl, URL, params + i);
+
+ curl_easy_cleanup(curl);
+ curl_global_cleanup();
+ return status;
+
+ test_cleanup:
+
+ curl_easy_cleanup(curl);
+ curl_global_cleanup();
+
+ return (int)res;
+}
projects / thirdparty / curl.git / commitdiff
