generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

verbose messages: fixed output of hostnames in re-used connections

Browse Source 
I suspect this is a regression introduced in commit 207cf150, included
since 7.24.0.

Avoid showing '(nil)' as hostname in verbose output by making sure the
hostname fixup function is called early enough to set the pointers that
are used for this. The name data is set again for each request even for
re-used connections to handle multiple hostnames over the same
connection (like with proxy) or that the casing etc of the host name is
changed between requests (which has proven to be important at least once
in the past).

Test1011 was modified to use a redirect with a re-used a connection
since it then showed the bug and now lo longer does. There's currently
no easy way to have the test suite detect 'nil' texts in verbose ouputs
so no tests will detect if this problem gets reintroduced.

Bug: http://curl.haxx.se/mail/lib-2012-07/0111.html
Reported by: Gisle Vanem
This commit is contained in:
Daniel Stenberg 2012-08-08 13:49:35 +02:00
parent 1de496cf0f
commit bf6dc61967
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/url.c
View File

@ -4659,13 +4659,12 @@ static CURLcode resolve_server(struct SessionHandle *data,
/************************************************************* /*************************************************************
* Resolve the name of the server or proxy * Resolve the name of the server or proxy
*************************************************************/ *************************************************************/
if(conn->bits.reuse) { if(conn->bits.reuse)
/* We're reusing the connection - no need to resolve anything */ /* We're reusing the connection - no need to resolve anything, and
fix_hostname() was called already in create_conn() for the re-use
case. */
*async = FALSE; *async = FALSE;
if(conn->bits.proxy)
fix_hostname(data, conn, &conn->host);
}
else { else {
/* this is a fresh connect */ /* this is a fresh connect */
int rc; int rc;
@ -5136,6 +5135,10 @@ static CURLcode create_conn(struct SessionHandle *data,
free(conn); /* we don't need this anymore */ free(conn); /* we don't need this anymore */
conn = conn_temp; conn = conn_temp;
*in_connect = conn; *in_connect = conn;
/* set a pointer to the hostname we display */
fix_hostname(data, conn, &conn->host);
infof(data, "Re-using existing connection! (#%ld) with host %s\n", infof(data, "Re-using existing connection! (#%ld) with host %s\n",
conn->connectindex, conn->connectindex,
conn->proxy.name?conn->proxy.dispname:conn->host.dispname); conn->proxy.name?conn->proxy.dispname:conn->host.dispname);

8
tests/data/test1011
View File

@ -10,10 +10,10 @@ followlocation
# Server-side # Server-side
<reply> <reply>
<data> <data>
HTTP/1.1 301 OK swsclose HTTP/1.1 301 OK
Location: moo.html&testcase=/10110002 Location: moo.html&testcase=/10110002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Content-Length: 0
</data> </data>
<data2> <data2>
@ -25,10 +25,10 @@ Connection: close
body body
</data2> </data2>
<datacheck> <datacheck>
HTTP/1.1 301 OK swsclose HTTP/1.1 301 OK
Location: moo.html&testcase=/10110002 Location: moo.html&testcase=/10110002
Date: Thu, 09 Nov 2010 14:49:00 GMT Date: Thu, 09 Nov 2010 14:49:00 GMT
Connection: close Content-Length: 0
HTTP/1.1 200 OK swsclose HTTP/1.1 200 OK swsclose
Location: this should be ignored Location: this should be ignored