[PATCH] Use RFC9110 HTTP status code descriptions

Sun Apr 14 10:26:23 UTC 2024

# HG changeset patch
# User Michiel W. Beijen <mb at x14.nl>
# Date 1713090220 -7200
#      Sun Apr 14 12:23:40 2024 +0200
# Branch stable-1.26
# Node ID 3375171a24a16400b000805e45df1b57e4dd1775
# Parent  cecfdf9a8420fcdeb69d090cd7fd9169967e0007
Use RFC9110 HTTP status code descriptions

This patch changes the status codes and status pages served by
freenginx to use the wording from RFC9110

Exeption for HTTP status code 413 "Request Entity Too Large",
which is "Content Too Large" in the RFC. In that case we would
lose information about what actually is too large, the request
or the response.

diff -r cecfdf9a8420 -r 3375171a24a1 src/http/ngx_http_header_filter_module.c

--- a/src/http/ngx_http_header_filter_module.c	Sun Apr 14 12:03:29 2024 +0200
+++ b/src/http/ngx_http_header_filter_module.c	Sun Apr 14 12:23:40 2024 +0200
@@ -69,7 +69,7 @@
     /* ngx_null_string, */  /* "300 Multiple Choices" */
 
     ngx_string("301 Moved Permanently"),
-    ngx_string("302 Moved Temporarily"),
+    ngx_string("302 Found"),
     ngx_string("303 See Other"),
     ngx_string("304 Not Modified"),
     ngx_null_string,  /* "305 Use Proxy" */
@@ -85,18 +85,18 @@
     ngx_string("402 Payment Required"),
     ngx_string("403 Forbidden"),
     ngx_string("404 Not Found"),
-    ngx_string("405 Not Allowed"),
+    ngx_string("405 Method Not Allowed"),
     ngx_string("406 Not Acceptable"),
     ngx_null_string,  /* "407 Proxy Authentication Required" */
-    ngx_string("408 Request Time-out"),
+    ngx_string("408 Request Timeout"),
     ngx_string("409 Conflict"),
     ngx_string("410 Gone"),
     ngx_string("411 Length Required"),
     ngx_string("412 Precondition Failed"),
     ngx_string("413 Request Entity Too Large"),
-    ngx_string("414 Request-URI Too Large"),
+    ngx_string("414 URI Too Long"),
     ngx_string("415 Unsupported Media Type"),
-    ngx_string("416 Requested Range Not Satisfiable"),
+    ngx_string("416 Range Not Satisfiable"),
     ngx_null_string,  /* "417 Expectation Failed" */
     ngx_null_string,  /* "418 unused" */
     ngx_null_string,  /* "419 unused" */
@@ -117,8 +117,8 @@
     ngx_string("500 Internal Server Error"),
     ngx_string("501 Not Implemented"),
     ngx_string("502 Bad Gateway"),
-    ngx_string("503 Service Temporarily Unavailable"),
-    ngx_string("504 Gateway Time-out"),
+    ngx_string("503 Service Unavailable"),
+    ngx_string("504 Gateway Timeout"),
     ngx_string("505 HTTP Version Not Supported"),
     ngx_null_string,        /* "506 Variant Also Negotiates" */
     ngx_string("507 Insufficient Storage"),
diff -r cecfdf9a8420 -r 3375171a24a1 src/http/ngx_http_special_response.c
--- a/src/http/ngx_http_special_response.c	Sun Apr 14 12:03:29 2024 +0200
+++ b/src/http/ngx_http_special_response.c	Sun Apr 14 12:23:40 2024 +0200
@@ -107,9 +107,9 @@
 
 static char ngx_http_error_401_page[] =
 "<html>" CRLF
-"<head><title>401 Authorization Required</title></head>" CRLF
+"<head><title>401 Unauthorized</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>401 Authorization Required</h1></center>" CRLF
+"<center><h1>401 Unauthorized</h1></center>" CRLF
 ;
 
 
@@ -139,9 +139,9 @@
 
 static char ngx_http_error_405_page[] =
 "<html>" CRLF
-"<head><title>405 Not Allowed</title></head>" CRLF
+"<head><title>405 Method Not Allowed</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>405 Not Allowed</h1></center>" CRLF
+"<center><h1>405 Method Not Allowed</h1></center>" CRLF
 ;
 
 
@@ -155,9 +155,9 @@
 
 static char ngx_http_error_408_page[] =
 "<html>" CRLF
-"<head><title>408 Request Time-out</title></head>" CRLF
+"<head><title>408 Request Timeout</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>408 Request Time-out</h1></center>" CRLF
+"<center><h1>408 Request Timeout</h1></center>" CRLF
 ;
 
 
@@ -203,9 +203,9 @@
 
 static char ngx_http_error_414_page[] =
 "<html>" CRLF
-"<head><title>414 Request-URI Too Large</title></head>" CRLF
+"<head><title>414 URI Too Long</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>414 Request-URI Too Large</h1></center>" CRLF
+"<center><h1>414 URI Too Long</h1></center>" CRLF
 ;
 
 
@@ -219,9 +219,9 @@
 
 static char ngx_http_error_416_page[] =
 "<html>" CRLF
-"<head><title>416 Requested Range Not Satisfiable</title></head>" CRLF
+"<head><title>416 Range Not Satisfiable</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>416 Requested Range Not Satisfiable</h1></center>" CRLF
+"<center><h1>416 Range Not Satisfiable</h1></center>" CRLF
 ;
 
 
@@ -307,17 +307,17 @@
 
 static char ngx_http_error_503_page[] =
 "<html>" CRLF
-"<head><title>503 Service Temporarily Unavailable</title></head>" CRLF
+"<head><title>503 Service Unavailable</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>503 Service Temporarily Unavailable</h1></center>" CRLF
+"<center><h1>503 Service Unavailable</h1></center>" CRLF
 ;
 
 
 static char ngx_http_error_504_page[] =
 "<html>" CRLF
-"<head><title>504 Gateway Time-out</title></head>" CRLF
+"<head><title>504 Gateway Timeout</title></head>" CRLF
 "<body>" CRLF
-"<center><h1>504 Gateway Time-out</h1></center>" CRLF
+"<center><h1>504 Gateway Timeout</h1></center>" CRLF
 ;
 
 


