Merge branch 'suicide' into espasyncws

src/PsychicHttpServer.cpp

@@ -23,6 +23,7 @@ PsychicHttpServer::PsychicHttpServer(uint16_t port) :
   config.close_fn = PsychicHttpServer::closeCallback;
   config.uri_match_fn = httpd_uri_match_wildcard;
   config.global_user_ctx = this;
+  config.global_user_ctx_free_fn = destroy;
   config.max_uri_handlers = 20;
   config.server_port = port;
 
@@ -54,6 +55,11 @@ PsychicHttpServer::~PsychicHttpServer()
   delete defaultEndpoint;
 }
 
+void PsychicHttpServer::destroy(void *ctx)
+{
+  // do not release any resource for PsychicHttpServer in order to be able to restart it after stopping
+}
+
 esp_err_t PsychicHttpServer::listen(uint16_t port)
 {
   this->_use_ssl = false;

src/PsychicHttpServer.h

@@ -38,6 +38,8 @@ class PsychicHttpServer
 
     PsychicEndpoint *defaultEndpoint;
 
+    static void destroy(void *ctx);
+
     esp_err_t listen(uint16_t port);
 
     virtual esp_err_t stop();

src/PsychicHttpsServer.cpp

@@ -10,6 +10,7 @@ PsychicHttpsServer::PsychicHttpsServer(uint16_t port) : PsychicHttpServer(port)
   ssl_config.httpd.close_fn = PsychicHttpServer::closeCallback;
   ssl_config.httpd.uri_match_fn = httpd_uri_match_wildcard;
   ssl_config.httpd.global_user_ctx = this;
+  ssl_config.httpd.global_user_ctx_free_fn = destroy;
   ssl_config.httpd.max_uri_handlers = 20;
 
   // each SSL connection takes about 45kb of heap

src/PsychicWebHandler.cpp

@@ -38,7 +38,7 @@ esp_err_t PsychicWebHandler::handleRequest(PsychicRequest *request)
   //get our body loaded up.
   esp_err_t err = request->loadBody();
   if (err != ESP_OK) {
-    ESP_LOGE(PH_TAG, "Failed to load body (%S)", esp_err_to_name(err));
+    ESP_LOGE(PH_TAG, "Failed to load body (%s)", esp_err_to_name(err));
     return err;
   }