http_proxy: fix the User-Agent inclusion in CONNECT

It should not refer to the uagent string that is allocated and created
for the end server http request, as that pointer may be cleared on
subsequent CONNECT requests.

Added test case 1184 to verify.

Reported-by: T200proX7 on github
Fixes #7705
Closes #7707
This commit is contained in:
Daniel Stenberg 2021-09-12 00:20:22 +02:00
parent 8822ecf7a1
commit 4a8fa48946
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
3 changed files with 130 additions and 19 deletions

108
tests/data/test1184 Normal file
View file

@ -0,0 +1,108 @@
<testcase>
<info>
<keywords>
HTTP
HTTP CONNECT
HTTP proxy
proxytunnel
</keywords>
</info>
#
# Server-side
<reply>
<connect>
HTTP/1.1 200 Mighty fine indeed
Server: test tunnel 2000
</connect>
<data nocheck="yes">
HTTP/1.1 302 OK
Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
Date: Tue, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Type: text/html
Funny-head: yesyes
Content-Length: 9
Connection: close
contents
</data>
<data2 nocheck="yes">
HTTP/1.1 200 OK
Content-Length: 7
second
</data2>
</reply>
#
# Client-side
<client>
<server>
http
http-proxy
</server>
<name>
HTTP 1.1 CONNECT with redirect and set -H user-agent
</name>
<command>
-x %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -L -H "User-Agent: %TESTNUMBER-agent"
</command>
<features>
proxy
</features>
</client>
#
# Verify data after the test has been "shot"
<verify>
<proxy>
CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
User-Agent: curl/%VERSION
Proxy-Connection: Keep-Alive
</proxy>
<protocol>
GET /we/want/that/page/%TESTNUMBER HTTP/1.1
Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
Accept: */*
User-Agent: %TESTNUMBER-agent
GET /we/want/that/page/%TESTNUMBER0002 HTTP/1.1
Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
Accept: */*
User-Agent: %TESTNUMBER-agent
</protocol>
<stdout>
HTTP/1.1 200 Mighty fine indeed
Server: test tunnel 2000
HTTP/1.1 302 OK
Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
Date: Tue, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Type: text/html
Funny-head: yesyes
Content-Length: 9
Connection: close
HTTP/1.1 200 Mighty fine indeed
Server: test tunnel 2000
HTTP/1.1 200 OK
Content-Length: 7
second
</stdout>
</verify>
</testcase>