Merge branch 'master' into pr-heap-refactor3

Author: mhightower83

cores/esp8266/core_esp8266_postmortem.cpp

@@ -120,6 +120,10 @@ static void cut_here() {
     ets_putc('\n');
 }
 
+static inline bool is_pc_valid(uint32_t pc) {
+    return pc >= XCHAL_INSTRAM0_VADDR && pc < (XCHAL_INSTROM0_VADDR + XCHAL_INSTROM0_SIZE);
+}
+
 /*
   Add some assembly to grab the stack pointer and pass it as an argument before
   it grows for the target function. Should stabilize the stack offsets, used to
@@ -135,7 +139,7 @@ asm(
     "\n"
 "__wrap_system_restart_local:\n\t"
     "mov          a2,     a1\n\t"
-    "j            postmortem_report\n\t"
+    "j.l          postmortem_report, a3\n\t"
     ".size __wrap_system_restart_local, .-__wrap_system_restart_local\n\t"
 );
 
@@ -193,7 +197,7 @@ static void postmortem_report(uint32_t sp_dump) {
     else if (rst_info.reason == REASON_SOFT_WDT_RST) {
         ets_printf_P(PSTR("\nSoft WDT reset"));
         const char infinite_loop[] = { 0x06, 0xff, 0xff };  // loop: j loop
-        if (0 == memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1, 3u)) {
+        if (is_pc_valid(rst_info.epc1) && 0 == memcmp_P(infinite_loop, (PGM_VOID_P)rst_info.epc1, 3u)) {
             // The SDK is riddled with these. They are usually preceded by an ets_printf.
             ets_printf_P(PSTR(" - deliberate infinite loop detected"));
         }

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

@@ -281,14 +281,13 @@ void ESP8266WebServerTemplate<ServerType>::serveStatic(const char* uri, FS& fs,
 template <typename ServerType>
 void ESP8266WebServerTemplate<ServerType>::handleClient() {
   if (_currentStatus == HC_NONE) {
-    ClientType client = _server.accept();
-    if (!client) {
+    _currentClient = _server.accept();
+    if (!_currentClient) {
       return;
     }
 
     DBGWS("New client\n");
 
-    _currentClient = client;
     _currentStatus = HC_WAIT_READ;
     _statusChange = millis();
   }

libraries/ESP8266WiFi/src/WiFiClient.h

@@ -107,12 +107,12 @@ class WiFiClient : public Client, public SList<WiFiClient> {
   static void stopAll();
   static void stopAllExcept(WiFiClient * c);
 
-  void     keepAlive (uint16_t idle_sec = TCP_DEFAULT_KEEPALIVE_IDLE_SEC, uint16_t intv_sec = TCP_DEFAULT_KEEPALIVE_INTERVAL_SEC, uint8_t count = TCP_DEFAULT_KEEPALIVE_COUNT);
-  bool     isKeepAliveEnabled () const;
-  uint16_t getKeepAliveIdle () const;
-  uint16_t getKeepAliveInterval () const;
-  uint8_t  getKeepAliveCount () const;
-  void     disableKeepAlive () { keepAlive(0, 0, 0); }
+  virtual void     keepAlive (uint16_t idle_sec = TCP_DEFAULT_KEEPALIVE_IDLE_SEC, uint16_t intv_sec = TCP_DEFAULT_KEEPALIVE_INTERVAL_SEC, uint8_t count = TCP_DEFAULT_KEEPALIVE_COUNT);
+  virtual bool     isKeepAliveEnabled () const;
+  virtual uint16_t getKeepAliveIdle () const;
+  virtual uint16_t getKeepAliveInterval () const;
+  virtual uint8_t  getKeepAliveCount () const;
+  virtual void     disableKeepAlive () { keepAlive(0, 0, 0); }
 
   // default NoDelay=False (Nagle=True=!NoDelay)
   // Nagle is for shortly delaying outgoing data, to send less/bigger packets

libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h

@@ -357,6 +357,21 @@ class WiFiClientSecure : public WiFiClient {
 
     // consume bytes after use (see peekBuffer)
     virtual void peekConsume (size_t consume) override { return _ctx->peekConsume(consume); }
+  
+    void keepAlive(uint16_t idle_sec = TCP_DEFAULT_KEEPALIVE_IDLE_SEC, uint16_t intv_sec = TCP_DEFAULT_KEEPALIVE_INTERVAL_SEC, uint8_t count = TCP_DEFAULT_KEEPALIVE_COUNT) override
+    {
+      _ctx->keepAlive(idle_sec, intv_sec, count);
+    }
+
+    bool isKeepAliveEnabled() const override { return _ctx->isKeepAliveEnabled(); };
+
+    uint16_t getKeepAliveIdle() const override { return _ctx->getKeepAliveIdle(); };
+
+    uint16_t getKeepAliveInterval() const override { return _ctx->getKeepAliveInterval(); };
+
+    uint8_t getKeepAliveCount() const override { return _ctx->getKeepAliveCount(); };
+
+    void disableKeepAlive() override { _ctx->disableKeepAlive(); };
 
   private:
     std::shared_ptr<WiFiClientSecureCtx> _ctx;