espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 13:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_8520' into 'master'

Browse Source 
esp_http_server: reword error messages (GitHub PR)

Closes IDFGH-6900

See merge request espressif/esp-idf!17398
This commit is contained in:
Anton Maklakov
2022-03-14 13:31:19 +08:00
parent b485e96714 a4afeed209
commit 18f62f067d
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_http_server/src/httpd_txrx.c
View File

@@ -381,7 +381,7 @@ esp_err_t httpd_resp_send_err(httpd_req_t *req, httpd_err_code_t error, const ch
switch (error) { switch (error) {
case HTTPD_501_METHOD_NOT_IMPLEMENTED: case HTTPD_501_METHOD_NOT_IMPLEMENTED:
status = "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; break;
case HTTPD_505_VERSION_NOT_SUPPORTED: case HTTPD_505_VERSION_NOT_SUPPORTED:
status = "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; break;
case HTTPD_400_BAD_REQUEST: case HTTPD_400_BAD_REQUEST:
status = "400 Bad Request"; status = "400 Bad Request";
msg = "Server unable to understand request due to invalid syntax"; msg = "Bad request syntax";
break; break;
case HTTPD_401_UNAUTHORIZED: case HTTPD_401_UNAUTHORIZED:
status = "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; break;
case HTTPD_403_FORBIDDEN: case HTTPD_403_FORBIDDEN:
status = "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; break;
case HTTPD_404_NOT_FOUND: case HTTPD_404_NOT_FOUND:
status = "404 Not Found"; status = "404 Not Found";
msg = "This URI does not exist"; msg = "Nothing matches the given URI";
break; break;
case HTTPD_405_METHOD_NOT_ALLOWED: case HTTPD_405_METHOD_NOT_ALLOWED:
status = "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; break;
case HTTPD_408_REQ_TIMEOUT: case HTTPD_408_REQ_TIMEOUT:
status = "408 Request 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; break;
case HTTPD_414_URI_TOO_LONG: case HTTPD_414_URI_TOO_LONG:
status = "414 URI Too Long"; status = "414 URI Too Long";
msg = "URI is too long for server to interpret"; msg = "URI is too long";
break; break;
case HTTPD_411_LENGTH_REQUIRED: case HTTPD_411_LENGTH_REQUIRED:
status = "411 Length Required"; status = "411 Length Required";
msg = "Chunked encoding not supported by server"; msg = "Client must specify Content-Length";
break; break;
case HTTPD_431_REQ_HDR_FIELDS_TOO_LARGE: case HTTPD_431_REQ_HDR_FIELDS_TOO_LARGE:
status = "431 Request Header 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; break;
case HTTPD_500_INTERNAL_SERVER_ERROR: case HTTPD_500_INTERNAL_SERVER_ERROR:
default: default:

1
tools/ci/check_copyright_ignore.txt
View File

@@ -2475,7 +2475,6 @@ tools/ci/deploy_docs.py
tools/ci/envsubst.py tools/ci/envsubst.py
tools/ci/python_packages/gitlab_api.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/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_http_server_test/test.py
tools/ci/python_packages/idf_iperf_test_util/Attenuator.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_iperf_test_util/IperfUtility.py

17
tools/ci/python_packages/idf_http_server_test/client.py
View File

@@ -1,18 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# Copyright 2018 Espressif Systems (Shanghai) PTE LTD # SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
# # SPDX-License-Identifier: Apache-2.0
# 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.
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
@@ -206,7 +195,7 @@ def test_put_handler(ip, port, verbosity=False):
raise AssertionError raise AssertionError
verbose_print(verbosity, 'Response on GET /invalid : ' + resp_data) 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 raise AssertionError
except http.client.HTTPException: except http.client.HTTPException: