arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Alex Potsides
2016-04-26 14:17:35 +01:00
parent 8b9f78eed3 234a8743c9
commit 1020c42291
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View File

@ -33,6 +33,10 @@
class TransportTraits
{
public:
virtual ~TransportTraits()
{
}
virtual std::unique_ptr<WiFiClient> create()
{
return std::unique_ptr<WiFiClient>(new WiFiClient());
@ -624,6 +628,13 @@ int HTTPClient::writeToStream(Stream * stream)
break;
}
// read trailing \r\n at the end of the chunk
char buf[2];
auto trailing_seq_len = _tcp->readBytes((uint8_t*)buf, 2);
if (trailing_seq_len != 2 || buf[0] != '\r' || buf[1] != '\n') {
return returnError(HTTPC_ERROR_READ_TIMEOUT);
}
delay(0);
}
} else {

2
libraries/ESP8266WiFi/src/include/UdpContext.h
View File

@ -213,7 +213,7 @@ public:
return size;
}
char peek()
int peek()
{
if (!_rx_buf || _rx_buf_offset == _rx_buf->len)
return -1;

2
tools/sdk/ld/eagle.app.v6.common.ld
View File

@ -78,6 +78,8 @@ SECTIONS
*(.sdata2.*)
*(.gnu.linkonce.s2.*)
*(.jcr)
. = ALIGN(4);
_Pri_3_HandlerAddress = ABSOLUTE(.);
_data_end = ABSOLUTE(.);
} >dram0_0_seg :dram0_0_phdr