[GNUnet-SVN] [gnurl] 42/116: CURLOPT_MAXREDIRS: allow -1 as a value

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 25cb41d35daad7544518dfd43c522355b13d9d79
Author: Daniel Stenberg <address@hidden>
AuthorDate: Tue Oct 31 15:01:23 2017 +0100

    CURLOPT_MAXREDIRS: allow -1 as a value
    
    ... which is valid according to documentation. Regression since
    f121575c0b5f.
    
    Verified now in test 501.
    
    Reported-by: cbartl on github
    Fixes #2038
    Closes #2039
---
 lib/url.c              | 2 +-
 tests/libtest/lib501.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/url.c b/lib/url.c
index dec402c1d..c334578ea 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1043,7 +1043,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption 
option,
      * headers. This should mostly be used to detect never-ending loops.
      */
     arg = va_arg(param, long);
-    if(arg < 0)
+    if(arg < -1)
       return CURLE_BAD_FUNCTION_ARGUMENT;
     data->set.maxredirs = arg;
     break;
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index 7a2341246..af65bd4d7 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -44,6 +44,9 @@ int test(char *URL)
 
   test_setopt(curl, CURLOPT_HEADER, 1L);
 
+  /* just verify that setting this to -1 is fine */
+  test_setopt(curl, CURLOPT_MAXREDIRS, -1L);
+
   res = curl_easy_perform(curl);
 
 test_cleanup:

-- 
To stop receiving notification emails like this one, please contact
address@hidden