-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
6 changed files
with
241 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
<testcase> | ||
<info> | ||
<keywords> | ||
HTTP | ||
HTTP GET | ||
HTTP CONNECT | ||
HTTP proxy | ||
proxytunnel | ||
</keywords> | ||
</info> | ||
|
||
# Server-side | ||
<reply> | ||
<connect> | ||
HTTP/1.1 200 OK | ||
We-are: good | ||
|
||
</connect> | ||
<data> | ||
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 | ||
</data> | ||
|
||
</reply> | ||
# Client-side | ||
<client> | ||
<server> | ||
http | ||
http-proxy | ||
</server> | ||
<tool> | ||
lib1528 | ||
</tool> | ||
<name> | ||
Separately specified proxy/server headers sent in a proxy GET | ||
</name> | ||
<command> | ||
http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT | ||
</command> | ||
</client> | ||
|
||
# Verify data after the test has been "shot" | ||
<verify> | ||
<proxy> | ||
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 | ||
|
||
</proxy> | ||
</verify> | ||
</testcase> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
/*************************************************************************** | ||
* _ _ ____ _ | ||
* Project ___| | | | _ \| | | ||
* / __| | | | |_) | | | ||
* | (__| |_| | _ <| |___ | ||
* \___|\___/|_| \_\_____| | ||
* | ||
* Copyright (C) 1998 - 2014, 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 | ||
* 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; | ||
} |