From 74851340bd7b4edbdc749e74562fc1ebcef9930f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 20 Feb 2014 17:10:00 +0100 Subject: PROXYHEADER: send these headers in "normal" proxy requests too Updated the docs to clarify and the code accordingly, with test 1528 to verify: When CURLHEADER_SEPARATE is set and libcurl is asked to send a request to a proxy but it isn't CONNECT, then _both_ header lists (CURLOPT_HTTPHEADER and CURLOPT_PROXYHEADER) will be used since the single request is then made for both the proxy and the server. --- tests/data/Makefile.am | 2 +- tests/data/test1528 | 60 ++++++++++++++++++++++++++++++++++++++ tests/libtest/Makefile.inc | 6 +++- tests/libtest/lib1528.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 tests/data/test1528 create mode 100644 tests/libtest/lib1528.c (limited to 'tests') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index fc7e19078..d1a87468b 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -129,7 +129,7 @@ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ test1516 \ \ -test1525 test1526 test1527 \ +test1525 test1526 test1527 test1528 \ \ test1900 test1901 test1902 test1903 \ \ diff --git a/tests/data/test1528 b/tests/data/test1528 new file mode 100644 index 000000000..876806af4 --- /dev/null +++ b/tests/data/test1528 @@ -0,0 +1,60 @@ + + + +HTTP +HTTP GET +HTTP CONNECT +HTTP proxy +proxytunnel + + + +# Server-side + + +HTTP/1.1 200 OK +We-are: good + + + +HTTP/1.1 200 OK swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Content-Length: 5 + +stop + + + +# Client-side + + +http +http-proxy + + +lib1528 + + +Separately specified proxy/server headers sent in a proxy GET + + + http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT + + + +# Verify data after the test has been "shot" + + +GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1 +Host: the.old.moo:%HTTPPORT +Accept: */* +Proxy-Connection: Keep-Alive +User-Agent: Http Agent +Proxy-User-Agent: Http Agent2 + + + + diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index bc243590f..bf7303668 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -23,7 +23,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 \ - lib1525 lib1526 lib1527 \ + lib1525 lib1526 lib1527 lib1528 \ lib1900 \ lib2033 @@ -369,6 +369,10 @@ lib1527_SOURCES = lib1527.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1527_LDADD = $(TESTUTIL_LIBS) lib1527_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1527 +lib1528_SOURCES = lib1528.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1528_LDADD = $(TESTUTIL_LIBS) +lib1528_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1528 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1528.c b/tests/libtest/lib1528.c new file mode 100644 index 000000000..94a7cd024 --- /dev/null +++ b/tests/libtest/lib1528.c @@ -0,0 +1,72 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "test.h" + +#include "memdebug.h" + +int test(char *URL) +{ + CURL *curl = NULL; + CURLcode res = CURLE_FAILED_INIT; + /* http header list*/ + struct curl_slist *hhl = NULL; + struct curl_slist *phl = NULL; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + if((curl = curl_easy_init()) == NULL) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + hhl = curl_slist_append(hhl, "User-Agent: Http Agent"); + phl = curl_slist_append(phl, "Proxy-User-Agent: Http Agent2"); + + if (!hhl) { + goto test_cleanup; + } + + test_setopt(curl, CURLOPT_URL, 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_VERBOSE, 1L); + test_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); + test_setopt(curl, CURLOPT_HEADER, 1L); + + res = curl_easy_perform(curl); + +test_cleanup: + + curl_easy_cleanup(curl); + curl_slist_free_all(hhl); + curl_slist_free_all(phl); + curl_global_cleanup(); + + return (int)res; +} -- cgit v1.2.3