aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-12-02 11:25:35 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-12-02 11:25:35 +0100
commitcee0fb3247d83d8c07eba62f539c8c0609609c43 (patch)
tree8c75fdf6b68454184b8d9abfdbbcbb60906e36b1
parent74595b223d36ce211d40c3e7acfc925a3b295097 (diff)
curl: support zero-length argument strings in config files
... like 'user-agent = ""' Adjusted test 71 to verify.
-rw-r--r--src/tool_parsecfg.c14
-rw-r--r--tests/data/test714
2 files changed, 7 insertions, 11 deletions
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index d9454c23a..7cf11d8a4 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -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,14 +209,10 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
filename, lineno, option);
}
}
- }
-
- 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;
+ if(!*param)
+ /* do this so getparameter can check for required parameters.
+ Otherwise it always thinks there's a parameter. */
+ param = NULL;
}
#ifdef DEBUG_CONFIG
diff --git a/tests/data/test71 b/tests/data/test71
index b71f969e7..341a0033f 100644
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -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