Commit cee0fb32 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl: support zero-length argument strings in config files 

... like 'user-agent = ""'

Adjusted test 71 to verify.
parent 74595b22

src/tool_parsecfg.c

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

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

 *

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

 * Copyright (C) 1998 - 2016, 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
@@ -209,13 +209,9 @@ int parseconfig(const char *filename, struct GlobalConfig *global) 
                  filename, lineno, option);

          }

        }

      }



      if(!*param) {

        if(!*param)

          /* do this so getparameter can check for required parameters.

             Otherwise it always thinks there's a parameter. */

        if(alloced_param)

          Curl_safefree(param);

          param = NULL;

      }

tests/data/test71

+2 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ HTTP and -F upload in config file 
-F name=daniel

-F tool=curl

-F file=@log/test71.txt

user-agent = ""

</stdin>

 <command>

http://%HOSTIP:%HTTPPORT/we/want/71 -K -
@@ -46,11 +47,10 @@ bar 
# Verify data after the test has been "shot"

<verify>

<strip>

^(User-Agent:|Content-Type: multipart/form-data;|------------).*

^(Content-Type: multipart/form-data;|------------).*

</strip>

<protocol>

POST /we/want/71 HTTP/1.1

User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3

Host: %HOSTIP:%HTTPPORT

Accept: */*

Content-Length: 408