Robert D. Young reported that CURLOPT_COOKIEFILE and CURLOPT_COOKIE could

not be used both in one request. Fixed it and added test case 172 to verify.

3 files changed, 50 insertions, 2 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a6446d7d6..8ed9d8e2d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -23,7 +23,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
  test203 test93 test94 test95 test509 test510 test97 test98 test99	\
  test150 test151 test152 test153 test154 test155 test156 test157	\
  test158 test159 test511 test160 test161 test162 test163 test164	\
- test512 test165 test166 test167 test168 test169 test170 test171
+ test512 test165 test166 test167 test168 test169 test170 test171	\
+ test172
 
 # The following tests have been removed from the dist since they no longer
 # work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test172 b/tests/data/test172
new file mode 100644
index 000000000..ff1cb7abe
--- /dev/null
+++ b/tests/data/test172
@@ -0,0 +1,47 @@
+# Server-side
+<reply>
+<data>
+HTTP/1.1 200 OK

+Content-Length: 4

+Connection: close

+

+boo
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+HTTP with cookies file and custom added cookie
+ </name>
+ <command>
+http://%HOSTIP:%HOSTPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
+</command>
+<file name="log/jar172.txt">
+# Netscape HTTP Cookie File
+# http://www.netscape.com/newsref/std/cookie_spec.html
+# This file was generated by libcurl! Edit at your own risk.
+
+.127.0.0.1	TRUE	/silly/	FALSE	0	ismatch	this
+.127.0.0.1	TRUE	/	FALSE	0	partmatch	present
+127.0.0.1	FALSE	/we/want/	FALSE	1391252187	nodomain	value
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /we/want/172 HTTP/1.1

+Host: 127.0.0.1:8999

+Pragma: no-cache

+Accept: */*

+Cookie: nodomain=value; partmatch=present; tool=curl; name=fool

+

+</protocol>
+</verify>
diff --git a/tests/data/test6 b/tests/data/test6
index fbd5c16ab..9a0d02cc3 100644
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -31,10 +31,10 @@ http://%HOSTIP:%HOSTPORT/we/want/that/page/6 -b "name=contents;name2=content2"
 </strip>
 <protocol>
 GET /we/want/that/page/6 HTTP/1.1

-Cookie: name=contents;name2=content2

 Host: 127.0.0.1:8999

 Pragma: no-cache

 Accept: */*

+Cookie: name=contents;name2=content2

 

 </protocol>
 </verify>