Merge branch 'bugfix/rename_http_server' into 'master'

Rename http_server component to esp_http_server

See merge request idf/esp-idf!3553

components/esp32/esp_err_to_name.c

@@ -13,6 +13,9 @@
 #if __has_include("esp_http_client.h")
 #include "esp_http_client.h"
 #endif
+#if __has_include("esp_http_server.h")
+#include "esp_http_server.h"
+#endif
 #if __has_include("esp_image_format.h")
 #include "esp_image_format.h"
 #endif
@@ -37,9 +40,6 @@
 #if __has_include("esp_wps.h")
 #include "esp_wps.h"
 #endif
-#if __has_include("http_server.h")
-#include "http_server.h"
-#endif
 #if __has_include("nvs.h")
 #include "nvs.h"
 #endif
@@ -456,7 +456,7 @@ static const esp_err_msg_t esp_err_msg_table[] = {
 #   ifdef      ESP_ERR_HTTP_EAGAIN
     ERR_TBL_IT(ESP_ERR_HTTP_EAGAIN),                        /* 28679 0x7007 Mapping of errno EAGAIN to esp_err_t */
 #   endif
-    // components/http_server/include/http_server.h
+    // components/esp_http_server/include/esp_http_server.h
 #   ifdef      ESP_ERR_HTTPD_BASE
     ERR_TBL_IT(ESP_ERR_HTTPD_BASE),                         /* 32768 0x8000 Starting number of HTTPD error codes */
 #   endif

components/esp_http_server/include/esp_http_server.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _HTTP_SERVER_H_
-#define _HTTP_SERVER_H_
+#ifndef _ESP_HTTP_SERVER_H_
+#define _ESP_HTTP_SERVER_H_
 
 #include <stdio.h>
 #include <string.h>
@@ -993,4 +993,4 @@ esp_err_t httpd_queue_work(httpd_handle_t handle, httpd_work_fn_t work, void *ar
 }
 #endif
 
-#endif /* ! _HTTP_SERVER_H_ */
+#endif /* ! _ESP_HTTP_SERVER_H_ */

components/esp_http_server/include/http_server.h

@@ -0,0 +1,2 @@
+#warning http_server.h has been renamed to esp_http_server.h, please update include directives
+#include "esp_http_server.h"

components/esp_http_server/src/esp_httpd_priv.h

@@ -22,8 +22,8 @@
 #include <netinet/in.h>
 #include <esp_log.h>
 #include <esp_err.h>
-#include <http_server.h>
 
+#include <esp_http_server.h>
 #include "osal.h"
 
 #ifdef __cplusplus

components/esp_http_server/src/httpd_main.c

@@ -20,8 +20,8 @@
 #include <esp_err.h>
 #include <assert.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 #include "ctrl_sock.h"
 
 static const char *TAG = "httpd";

components/esp_http_server/src/httpd_parse.c

@@ -18,9 +18,9 @@
 #include <esp_log.h>
 #include <esp_err.h>
 #include <http_parser.h>
-#include <http_server.h>
 
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 #include "osal.h"
 
 static const char *TAG = "httpd_parse";

components/esp_http_server/src/httpd_sess.c

@@ -17,8 +17,8 @@
 #include <esp_log.h>
 #include <esp_err.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_sess";
 

components/esp_http_server/src/httpd_txrx.c

@@ -17,8 +17,8 @@
 #include <esp_log.h>
 #include <esp_err.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_txrx";
 

components/esp_http_server/src/httpd_uri.c

@@ -18,8 +18,8 @@
 #include <esp_err.h>
 #include <http_parser.h>
 
-#include <http_server.h>
-#include "httpd_priv.h"
+#include <esp_http_server.h>
+#include "esp_httpd_priv.h"
 
 static const char *TAG = "httpd_uri";
 

components/esp_http_server/test/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+
+set(COMPONENT_REQUIRES unity esp_http_server)
+
+register_component()

components/esp_http_server/test/test_http_server.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <esp_system.h>
-#include <http_server.h>
+#include <esp_http_server.h>
 
 #include "unity.h"
 #include "test_utils.h"

components/http_server/test/CMakeLists.txt

@@ -1,6 +0,0 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-set(COMPONENT_REQUIRES unity http_server)
-
-register_component()

components/protocomm/CMakeLists.txt

@@ -12,7 +12,7 @@ set(COMPONENT_SRCS  "src/common/protocomm.c"
                     "src/transports/protocomm_console.c"
                     "src/transports/protocomm_httpd.c")
 
-set(COMPONENT_PRIV_REQUIRES protobuf-c mbedtls console http_server bt)
+set(COMPONENT_PRIV_REQUIRES protobuf-c mbedtls console esp_http_server bt)
 
 if(CONFIG_BT_ENABLED)
     if(CONFIG_BLUEDROID_ENABLED)

components/protocomm/src/transports/protocomm_httpd.c

@@ -17,7 +17,7 @@
 #include <esp_log.h>
 #include <esp_err.h>
 
-#include <http_server.h>
+#include <esp_http_server.h>
 
 #include <protocomm.h>
 #include <protocomm_httpd.h>

docs/Doxyfile

@@ -97,7 +97,7 @@ INPUT = \
     ## mDNS
     ../../components/mdns/include/mdns.h \
     ../../components/esp_http_client/include/esp_http_client.h \
-    ../../components/http_server/include/http_server.h \
+    ../../components/esp_http_server/include/esp_http_server.h \
     ##
     ## Provisioning - API Reference
     ##

docs/en/api-reference/protocols/esp_http_server.rst

@@ -81,7 +81,7 @@ Application Example
             /* Generate default configuration */
             httpd_config_t config = HTTPD_DEFAULT_CONFIG();
 
-            /* Empty handle to http_server */
+            /* Empty handle to esp_http_server */
             httpd_handle_t server = NULL;
 
             /* Start the httpd server */
@@ -154,4 +154,4 @@ Check the example under :example:`protocols/http_server/persistent_sockets`.
 API Reference
 -------------
 
-.. include:: /_build/inc/http_server.inc
+.. include:: /_build/inc/esp_http_server.inc

docs/en/api-reference/protocols/index.rst

@@ -7,7 +7,7 @@ Protocols API
    mDNS <mdns>
    ESP-TLS <esp_tls>
    HTTP Client <esp_http_client>
-   HTTP Server <http_server>
+   HTTP Server <esp_http_server>
    ASIO <asio>
    ESP-MQTT <mqtt>
    Modbus slave <modbus>

docs/zh_CN/api-reference/protocols/esp_http_server.rst

@@ -0,0 +1 @@
+.. include:: ../../../en/api-reference/protocols/esp_http_server.rst

docs/zh_CN/api-reference/protocols/http_server.rst

@@ -1 +0,0 @@
-.. include:: ../../../en/api-reference/protocols/http_server.rst

examples/protocols/http_server/advanced_tests/main/include/tests.h

@@ -1,7 +1,7 @@
 #ifndef __HTTPD_TESTS_H__
 #define __HTTPD_TESTS_H__
 
-#include <http_server.h>
+#include <esp_http_server.h>
 
 extern httpd_handle_t   start_tests(void);
 extern void              stop_tests(httpd_handle_t hd);

examples/protocols/http_server/advanced_tests/main/tests.c

@@ -3,7 +3,7 @@
 
 #include <esp_log.h>
 #include <esp_system.h>
-#include <http_server.h>
+#include <esp_http_server.h>
 
 #include "tests.h"
 

examples/protocols/http_server/persistent_sockets/main/main.c

@@ -13,7 +13,7 @@
 #include <esp_system.h>
 #include <nvs_flash.h>
 
-#include <http_server.h>
+#include <esp_http_server.h>
 
 /* An example to demonstrate persistent sockets, with context maintained across
  * multiple requests on that socket.

examples/protocols/http_server/simple/main/main.c

@@ -14,7 +14,7 @@
 #include <nvs_flash.h>
 #include <sys/param.h>
 
-#include <http_server.h>
+#include <esp_http_server.h>
 
 /* A simple example that demonstrates how to create GET and POST
  * handlers for the web server.