security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Part of issue 1447: Pass proper Host header when SRV is used. 

* common/http.c (send_request, connect_server): Set proper Host header
  (no :port, host is that of the SRV) when SRV is used in the
  curl-shim.

Backported from cbe98b2cb1
This commit is contained in:
David Shaw 2012-12-19 11:43:28 -05:00
parent 3d56d486e1
commit 6c3a76cca0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/http.c
View File

@ -599,16 +599,18 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy,
authstr?authstr:"",proxy_authstr?proxy_authstr:"" );
else
{
char portstr[15];
char portstr[35];
if(port!=80)
if(port == 80 || (srv && srv->used_server))
*portstr = 0;
else
sprintf(portstr,":%u",port);
sprintf( request, "%s %s%s HTTP/1.0\r\nHost: %s%s\r\n%s",
hd->req_type == HTTP_REQ_GET ? "GET" :
hd->req_type == HTTP_REQ_HEAD? "HEAD":
hd->req_type == HTTP_REQ_POST? "POST": "OOPS",
*p == '/'? "":"/", p, server, (port!=80)?portstr:"",
*p == '/'? "":"/", p, server, portstr,
authstr?authstr:"");
}
@ -822,6 +824,7 @@ connect_server( const char *server, ushort port, unsigned int flags,
int connected = 0;
int hostfound = 0;
int chosen = -1;
int fakesrv = 0;
struct srventry *srvlist = NULL;
int srvindex;
@ -885,7 +888,8 @@ connect_server( const char *server, ushort port, unsigned int flags,
srvlist->port=port;
strncpy(srvlist->target,server,MAXDNAME);
srvlist->target[MAXDNAME-1]='\0';
srvcount=1;
srvcount = 1;
fakesrv = 1;
}
#ifdef HAVE_GETADDRINFO
@ -986,7 +990,7 @@ connect_server( const char *server, ushort port, unsigned int flags,
}
#endif /* !HAVE_GETADDRINFO */
if(chosen > -1 && srv)
if(!fakesrv && chosen > -1 && srv)
{
srv->used_server = strdup (srvlist[chosen].target);
srv->used_port = srvlist[chosen].port;