Merge branch 'contrib/github_pr_8520' into 'master'

esp_http_server: reword error messages (GitHub PR)

Closes IDFGH-6900

See merge request espressif/esp-idf!17398

components/esp_http_server/src/httpd_txrx.c

@@ -381,7 +381,7 @@ esp_err_t httpd_resp_send_err(httpd_req_t *req, httpd_err_code_t error, const ch
     switch (error) {
         case HTTPD_501_METHOD_NOT_IMPLEMENTED:
             status = "501 Method Not Implemented";
-            msg    = "Request method is not supported by server";
+            msg    = "Server does not support this method";
             break;
         case HTTPD_505_VERSION_NOT_SUPPORTED:
             status = "505 Version Not Supported";
@@ -389,23 +389,23 @@ esp_err_t httpd_resp_send_err(httpd_req_t *req, httpd_err_code_t error, const ch
             break;
         case HTTPD_400_BAD_REQUEST:
             status = "400 Bad Request";
-            msg    = "Server unable to understand request due to invalid syntax";
+            msg    = "Bad request syntax";
             break;
         case HTTPD_401_UNAUTHORIZED:
             status = "401 Unauthorized";
-            msg    = "Server known the client's identify and it must authenticate itself to get he requested response";
+            msg    = "No permission -- see authorization schemes";
             break;
         case HTTPD_403_FORBIDDEN:
             status = "403 Forbidden";
-            msg    = "Server is refusing to give the requested resource to the client";
+            msg    = "Request forbidden -- authorization will not help";
             break;
         case HTTPD_404_NOT_FOUND:
             status = "404 Not Found";
-            msg    = "This URI does not exist";
+            msg    = "Nothing matches the given URI";
             break;
         case HTTPD_405_METHOD_NOT_ALLOWED:
             status = "405 Method Not Allowed";
-            msg    = "Request method for this URI is not handled by server";
+            msg    = "Specified method is invalid for this resource";
             break;
         case HTTPD_408_REQ_TIMEOUT:
             status = "408 Request Timeout";
@@ -413,15 +413,15 @@ esp_err_t httpd_resp_send_err(httpd_req_t *req, httpd_err_code_t error, const ch
             break;
         case HTTPD_414_URI_TOO_LONG:
             status = "414 URI Too Long";
-            msg    = "URI is too long for server to interpret";
+            msg    = "URI is too long";
             break;
         case HTTPD_411_LENGTH_REQUIRED:
             status = "411 Length Required";
-            msg    = "Chunked encoding not supported by server";
+            msg    = "Client must specify Content-Length";
             break;
         case HTTPD_431_REQ_HDR_FIELDS_TOO_LARGE:
             status = "431 Request Header Fields Too Large";
-            msg    = "Header fields are too long for server to interpret";
+            msg    = "Header fields are too long";
             break;
         case HTTPD_500_INTERNAL_SERVER_ERROR:
         default:

tools/ci/check_copyright_ignore.txt

@@ -2475,7 +2475,6 @@ tools/ci/deploy_docs.py
 tools/ci/envsubst.py
 tools/ci/python_packages/gitlab_api.py
 tools/ci/python_packages/idf_http_server_test/adder.py
-tools/ci/python_packages/idf_http_server_test/client.py
 tools/ci/python_packages/idf_http_server_test/test.py
 tools/ci/python_packages/idf_iperf_test_util/Attenuator.py
 tools/ci/python_packages/idf_iperf_test_util/IperfUtility.py

tools/ci/python_packages/idf_http_server_test/client.py

@@ -1,18 +1,7 @@
 #!/usr/bin/env python
 #
-# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 
 from __future__ import print_function, unicode_literals
 
@@ -206,7 +195,7 @@ def test_put_handler(ip, port, verbosity=False):
             raise AssertionError
 
         verbose_print(verbosity, 'Response on GET /invalid : ' + resp_data)
-        if not test_val('Response mismatch', 'This URI does not exist', resp_data):
+        if not test_val('Response mismatch', 'Nothing matches the given URI', resp_data):
             raise AssertionError
 
     except http.client.HTTPException: