Author: geoff
Date: Thu Dec 9 13:09:26 2004
New Revision: 111432
URL: http://svn.apache.org/viewcvs?view=rev&rev=111432
Log:
undo changes made in 111386 due to veto
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/include/httpd.h
httpd/httpd/trunk/modules/http/http_protocol.c
Modified: httpd/httpd/trunk/CHANGES
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&rev=111432&p1=httpd/httpd/trunk/CHANGES&r1=111431&p2=httpd/httpd/trunk/CHANGES&r2=111432
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Thu Dec 9 13:09:26 2004
@@ -2,10 +2,6 @@
[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 31228.
- [Garrett Rooney <rooneg electricjellyfish.net>]
-
Changes with Apache 2.1.2
*) mod_proxy: Respect errors reported by pre_connection hooks.
Modified: httpd/httpd/trunk/include/httpd.h
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/include/httpd.h?view=diff&rev=111432&p1=httpd/httpd/trunk/include/httpd.h&r1=111431&p2=httpd/httpd/trunk/include/httpd.h&r2=111432
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Thu Dec 9 13:09:26 2004
@@ -427,7 +427,7 @@
* 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 76
+#define RESPONSE_CODES 57
#define HTTP_CONTINUE 100
#define HTTP_SWITCHING_PROTOCOLS 101
@@ -440,7 +440,6 @@
#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
Modified: httpd/httpd/trunk/modules/http/http_protocol.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/http/http_protocol.c?view=diff&rev=111432&p1=httpd/httpd/trunk/modules/http/http_protocol.c&r1=111431&p2=httpd/httpd/trunk/modules/http/http_protocol.c&r2=111432
==============================================================================
--- httpd/httpd/trunk/modules/http/http_protocol.c (original)
+++ httpd/httpd/trunk/modules/http/http_protocol.c Thu Dec 9 13:09:26 2004
@@ -85,26 +85,7 @@
"205 Reset Content",
"206 Partial Content",
"207 Multi-Status",
- "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
+#define LEVEL_300 11
"300 Multiple Choices",
"301 Moved Permanently",
"302 Found",
@@ -113,7 +94,7 @@
"305 Use Proxy",
"306 unused",
"307 Temporary Redirect",
-#define LEVEL_400 38
+#define LEVEL_400 19
"400 Bad Request",
"401 Authorization Required",
"402 Payment Required",
@@ -144,7 +125,7 @@
*/
"425 No code",
"426 Upgrade Required",
-#define LEVEL_500 65
+#define LEVEL_500 46
"500 Internal Server Error",
"501 Method Not Implemented",
"502 Bad Gateway",
|