espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a bug causing httpdGetHeader to fail when POST data is present. Thanks to Damien Nicolet for reporting the bug and sending me a patch.

Browse Source
This commit is contained in:
Jeroen Domburg
2015-02-02 23:33:15 +01:00
parent 3b2bbf018d
commit db687e58d1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/httpd.c
+4 -3
View File
@@ -369,12 +369,14 @@ static void ICACHE_FLASH_ATTR httpdRecvCb(void *arg, char *data, unsigned short
conn->priv->sendBuffLen=0;
for (x=0; x<len; x++) {
if (conn->priv->headPos!=-1) {
if (conn->postLen<0) {
//This byte is a header byte.
if (conn->priv->headPos!=MAX_HEAD_LEN) conn->priv->head[conn->priv->headPos++]=data[x];
conn->priv->head[conn->priv->headPos]=0;
//Scan for /r/n/r/n
if (data[x]=='\n' && (char *)os_strstr(conn->priv->head, "\r\n\r\n")!=NULL) {
//Indicate we're done with the headers.
conn->postLen=0;
//Reset url data
conn->url=NULL;
//Find end of next header line
@@ -390,7 +392,6 @@ static void ICACHE_FLASH_ATTR httpdRecvCb(void *arg, char *data, unsigned short
if (conn->postLen==0) {
httpdSendResp(conn);
}
conn->priv->headPos=-1; //Indicate we're done with the headers.
}
} else if (conn->priv->postPos!=-1 && conn->postLen!=0 && conn->priv->postPos <= conn->postLen) {
//This byte is a POST byte.
@@ -460,7 +461,7 @@ static void ICACHE_FLASH_ATTR httpdConnectCb(void *arg) {
connData[i].priv->headPos=0;
connData[i].postBuff=NULL;
connData[i].priv->postPos=0;
connData[i].postLen=0;
connData[i].postLen=-1;
espconn_regist_recvcb(conn, httpdRecvCb);
espconn_regist_reconcb(conn, httpdReconCb);