]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
projects / thirdparty / haproxy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 405ff31)
MINOR: Use "500 Internal Server Error" for 500 error/status code message.
authorJarno Huuskonen <jarno.huuskonen@uef.fi>
Mon, 9 Jan 2017 12:17:10 +0000 (14:17 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 11 Jan 2017 11:44:40 +0000 (12:44 +0100)
Internal Server Error is what is in RFC 2616/7231.

examples/errorfiles/500.http patch | blob | blame | history
src/hlua.c patch | blob | blame | history
src/proto_http.c patch | blob | blame | history

diff --git a/examples/errorfiles/500.http b/examples/errorfiles/500.http
index bb121e82a1a0434ca23bed6cb1fb060540ca051b..ebf7d47f1b32291e2335fb1541594b00c60a583e 100644 (file)
--- a/examples/errorfiles/500.http
+++ b/examples/errorfiles/500.http
@@ -1,9 +1,9 @@
-HTTP/1.0 500 Server Error\r
+HTTP/1.0 500 Internal Server Error\r
 Cache-Control: no-cache\r
 Connection: close\r
 Content-Type: text/html\r
 \r
-<html><body><h1>500 Server Error</h1>
+<html><body><h1>500 Internal Server Error</h1>
 An internal server error occured.
 </body></html>
 
diff --git a/src/hlua.c b/src/hlua.c
index 35fb71789f9c8eb970346bc13344727c4f2d47f1..bfb9c941817f8dc642d687818548f5720aa0ff8f 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -216,12 +216,12 @@ struct hlua_mem_allocator {
 static struct hlua_mem_allocator hlua_global_allocator;
 
 static const char error_500[] =
-       "HTTP/1.0 500 Server Error\r\n"
+       "HTTP/1.0 500 Internal Server Error\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
        "\r\n"
-       "<html><body><h1>500 Server Error</h1>\nAn internal server error occured.\n</body></html>\n";
+       "<html><body><h1>500 Internal Server Error</h1>\nAn internal server error occured.\n</body></html>\n";
 
 /* These functions converts types between HAProxy internal args or
  * sample and LUA types. Another function permits to check if the
diff --git a/src/proto_http.c b/src/proto_http.c
index f7f7545107a19582fca9a6e89862b3504c9f54ea..8bc1636cfda2aad5eb267ba5fb5d4d3d66537021 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -196,12 +196,12 @@ static const char *http_err_msgs[HTTP_ERR_SIZE] = {
        "<html><body><h1>429 Too Many Requests</h1>\nYou have sent too many requests in a given amount of time.\n</body></html>\n",
 
        [HTTP_ERR_500] =
-       "HTTP/1.0 500 Server Error\r\n"
+       "HTTP/1.0 500 Internal Server Error\r\n"
        "Cache-Control: no-cache\r\n"
        "Connection: close\r\n"
        "Content-Type: text/html\r\n"
        "\r\n"
-       "<html><body><h1>500 Server Error</h1>\nAn internal server error occured.\n</body></html>\n",
+       "<html><body><h1>500 Internal Server Error</h1>\nAn internal server error occured.\n</body></html>\n",
 
        [HTTP_ERR_502] =
        "HTTP/1.0 502 Bad Gateway\r\n"
Mirror of https://github.com/haproxy/haproxy.git