Commit 25cb41d3 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

CURLOPT_MAXREDIRS: allow -1 as a value 

... which is valid according to documentation. Regression since
f121575c.

Verified now in test 501.

Reported-by: cbartl on github
Fixes #2038
Closes #2039
parent cda89c8b

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/libtest/lib501.c

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2017, 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
@@ -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: