From ef6be35bae1fe501fecd9a2a21eb5d03ddff4243 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 4 Feb 2014 23:37:29 +0100 Subject: CURLOPT_HEADEROPT: added Modified the logic so that CURLOPT_HEADEROPT now controls if PROXYHEADER is actually used or not. --- tests/data/test1525 | 2 +- tests/libtest/lib1525.c | 3 ++- tests/libtest/lib1526.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/data/test1525 b/tests/data/test1525 index 13e0d1489..0560d5c1a 100644 --- a/tests/data/test1525 +++ b/tests/data/test1525 @@ -46,7 +46,7 @@ http-proxy lib1525 -CURLOPT_PROXYHEADER: same headers for host and proxy +CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED http://the.old.moo.1525:%HTTPPORT/1525 %HOSTIP:%PROXYPORT diff --git a/tests/libtest/lib1525.c b/tests/libtest/lib1525.c index 45e914e69..957b4295e 100644 --- a/tests/libtest/lib1525.c +++ b/tests/libtest/lib1525.c @@ -71,7 +71,8 @@ int test(char *URL) test_setopt(curl, CURLOPT_URL, URL); test_setopt(curl, CURLOPT_PROXY, libtest_arg2); test_setopt(curl, CURLOPT_HTTPHEADER, hhl); - test_setopt(curl, CURLOPT_PROXYHEADER, NULL); + test_setopt(curl, CURLOPT_PROXYHEADER, hhl); + test_setopt(curl, CURLOPT_HEADEROPT, CURLHEADER_UNIFIED); test_setopt(curl, CURLOPT_POST, 0L); test_setopt(curl, CURLOPT_UPLOAD, 1L); test_setopt(curl, CURLOPT_VERBOSE, 1L); diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c index e71512854..fb757f592 100644 --- a/tests/libtest/lib1526.c +++ b/tests/libtest/lib1526.c @@ -72,6 +72,7 @@ int test(char *URL) test_setopt(curl, CURLOPT_PROXY, libtest_arg2); test_setopt(curl, CURLOPT_HTTPHEADER, hhl); test_setopt(curl, CURLOPT_PROXYHEADER, phl); + test_setopt(curl, CURLOPT_HEADEROPT, CURLHEADER_SEPARATE); test_setopt(curl, CURLOPT_POST, 0L); test_setopt(curl, CURLOPT_UPLOAD, 1L); test_setopt(curl, CURLOPT_VERBOSE, 1L); -- cgit v1.2.3