summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--include/httpd.h3
-rw-r--r--modules/http/http_protocol.c25
3 files changed, 28 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index e9abef2e84..51a9027a9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.3
[Remove entries to the current 2.0 section below, when backported]
+ *) add response code 226 constant (HTTP_IM_USED) and status
+ line ("226 IM Used"). PR 31128.
+ [Garrett Rooney <rooneg electricjellyfish.net>]
+
Changes with Apache 2.1.2
*) mod_proxy: Respect errors reported by pre_connection hooks.
diff --git a/include/httpd.h b/include/httpd.h
index 47e40c9254..8111861456 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -427,7 +427,7 @@ AP_DECLARE(const char *) ap_get_server_built(void);
* all of the potential response status-lines (a sparse table).
* A future version should dynamically generate the apr_table_t at startup.
*/
-#define RESPONSE_CODES 57
+#define RESPONSE_CODES 76
#define HTTP_CONTINUE 100
#define HTTP_SWITCHING_PROTOCOLS 101
@@ -440,6 +440,7 @@ AP_DECLARE(const char *) ap_get_server_built(void);
#define HTTP_RESET_CONTENT 205
#define HTTP_PARTIAL_CONTENT 206
#define HTTP_MULTI_STATUS 207
+#define HTTP_IM_USED 226
#define HTTP_MULTIPLE_CHOICES 300
#define HTTP_MOVED_PERMANENTLY 301
#define HTTP_MOVED_TEMPORARILY 302
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 83efcc2260..82a59b66dd 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -85,7 +85,26 @@ static const char * const status_lines[RESPONSE_CODES] =
"205 Reset Content",
"206 Partial Content",
"207 Multi-Status",
-#define LEVEL_300 11
+ "208 unused",
+ "209 unused",
+ "210 unused",
+ "211 unused",
+ "212 unused",
+ "213 unused",
+ "214 unused",
+ "215 unused",
+ "216 unused",
+ "217 unused",
+ "218 unused",
+ "219 unused",
+ "220 unused",
+ "221 unused",
+ "222 unused",
+ "223 unused",
+ "224 unused",
+ "225 unused",
+ "226 IM Used",
+#define LEVEL_300 30
"300 Multiple Choices",
"301 Moved Permanently",
"302 Found",
@@ -94,7 +113,7 @@ static const char * const status_lines[RESPONSE_CODES] =
"305 Use Proxy",
"306 unused",
"307 Temporary Redirect",
-#define LEVEL_400 19
+#define LEVEL_400 38
"400 Bad Request",
"401 Authorization Required",
"402 Payment Required",
@@ -125,7 +144,7 @@ static const char * const status_lines[RESPONSE_CODES] =
*/
"425 No code",
"426 Upgrade Required",
-#define LEVEL_500 46
+#define LEVEL_500 65
"500 Internal Server Error",
"501 Method Not Implemented",
"502 Bad Gateway",