Skip to content

Commit 4247b64

Browse files
committed
Merge remote-tracking branch 'remotes/esp8266/master'
2 parents fb55e91 + 3873627 commit 4247b64

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cores/esp8266/core_esp8266_phy.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include <stdint.h>
2424
#include <stddef.h>
2525
#include <stdbool.h>
26-
27-
#include "c_types.h"
26+
#include <string.h>
27+
#include "c_types.h"
2828

2929
static const uint8_t ICACHE_FLASH_ATTR phy_init_data[128] =
3030
{

doc/filesystem.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ESPDuino | 4M | 1M, 3M
6161

6262
*ESP8266FS* is a tool which integrates into the Arduino IDE. It adds a menu item to *Tools* menu for uploading the contents of sketch data directory into ESP8266 flash file system.
6363

64-
- Download the tool: https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.1.3/ESP8266FS-0.1.3.zip.
64+
- Download the tool: https://github.com/esp8266/arduino-esp8266fs-plugin/releases/download/0.2.0/ESP8266FS-0.2.0.zip.
6565
- In your Arduino sketchbook directory, create `tools` directory if it doesn't exist yet
6666
- Unpack the tool into `tools` directory (the path will look like `<home_dir>/Arduino/tools/ESP8266FS/tool/esp8266fs.jar`)
6767
- Restart Arduino IDE

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ bool HTTPClient::sendHeader(const char * type) {
798798
header += "\r\n";
799799

800800
if(!_useHTTP10) {
801-
header += "Accept-Encoding: identity;q=1 chunked;q=0.1 *;q=0\r\n";
801+
header += "Accept-Encoding: identity;q=1,chunked;q=0.1,*;q=0\r\n";
802802
}
803803

804804
if(_base64Authorization.length()) {

0 commit comments

Comments
 (0)