MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip passing port in Host header if standard port. (#1362) 

Some virtual hosts break if the port is added in the headers.
This commit is contained in:
Jonathan Karras 2016-06-15 04:45:39 -06:00 committed by Marcel Stör
parent 0d3e0bbb71
commit 7ff8326cc9
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/http/httpclient.c
View File

@ -181,7 +181,7 @@ static void ICACHE_FLASH_ATTR http_connect_callback( void * arg )
HTTPCLIENT_DEBUG( "Connected\n" ); HTTPCLIENT_DEBUG( "Connected\n" );
struct espconn * conn = (struct espconn *) arg; struct espconn * conn = (struct espconn *) arg;
request_args_t * req = (request_args_t *) conn->reverse; request_args_t * req = (request_args_t *) conn->reverse;
int len;
espconn_regist_recvcb( conn, http_receive_callback ); espconn_regist_recvcb( conn, http_receive_callback );
espconn_regist_sentcb( conn, http_send_callback ); espconn_regist_sentcb( conn, http_send_callback );
@ -200,7 +200,20 @@ static void ICACHE_FLASH_ATTR http_connect_callback( void * arg )
char buf[69 + strlen( req->method ) + strlen( req->path ) + strlen( req->hostname ) + char buf[69 + strlen( req->method ) + strlen( req->path ) + strlen( req->hostname ) +
strlen( req->headers ) + strlen( post_headers )]; strlen( req->headers ) + strlen( post_headers )];
int len = os_sprintf( buf,
if ((req->port == 80) || ((req->port == 443) && ( req->secure )))
{
len = os_sprintf( buf,
"%s %s HTTP/1.1\r\n"
"Host: %s\r\n"
"Connection: close\r\n"
"User-Agent: ESP8266\r\n"
"%s"
"%s"
"\r\n",
req->method, req->path, req->hostname, req->headers, post_headers );
} else {
len = os_sprintf( buf,
"%s %s HTTP/1.1\r\n" "%s %s HTTP/1.1\r\n"
"Host: %s:%d\r\n" "Host: %s:%d\r\n"
"Connection: close\r\n" "Connection: close\r\n"
@ -209,7 +222,7 @@ static void ICACHE_FLASH_ATTR http_connect_callback( void * arg )
"%s" "%s"
"\r\n", "\r\n",
req->method, req->path, req->hostname, req->port, req->headers, post_headers ); req->method, req->path, req->hostname, req->port, req->headers, post_headers );
}
if ( req->secure ) if ( req->secure )
espconn_secure_send( conn, (uint8_t *) buf, len ); espconn_secure_send( conn, (uint8_t *) buf, len );
else else