1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: Use "500 Internal Server Error" for 500 error/status code message.

Browse Source 
Internal Server Error is what is in RFC 2616/7231.
This commit is contained in:
Jarno Huuskonen 2017-01-09 14:17:10 +02:00 committed by Willy Tarreau
parent 405ff31e31
commit 16ad94adf6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/errorfiles/500.http
View File

@ -1,9 +1,9 @@
HTTP/1.0 500 Server Error HTTP/1.0 500 Internal Server Error
Cache-Control: no-cache Cache-Control: no-cache
Connection: close Connection: close
Content-Type: text/html Content-Type: text/html
<html><body><h1>500 Server Error</h1> <html><body><h1>500 Internal Server Error</h1>
An internal server error occured. An internal server error occured.
</body></html> </body></html>

4
src/hlua.c
View File

@ -216,12 +216,12 @@ struct hlua_mem_allocator {
static struct hlua_mem_allocator hlua_global_allocator; static struct hlua_mem_allocator hlua_global_allocator;
static const char error_500[] = 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" "Cache-Control: no-cache\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Content-Type: text/html\r\n" "Content-Type: text/html\r\n"
"\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 /* These functions converts types between HAProxy internal args or
* sample and LUA types. Another function permits to check if the * sample and LUA types. Another function permits to check if the

4
src/proto_http.c
View File

@ -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", "<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_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" "Cache-Control: no-cache\r\n"
"Connection: close\r\n" "Connection: close\r\n"
"Content-Type: text/html\r\n" "Content-Type: text/html\r\n"
"\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_ERR_502] =
"HTTP/1.0 502 Bad Gateway\r\n" "HTTP/1.0 502 Bad Gateway\r\n"