Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 22207 invoked from network); 9 Dec 2004 14:17:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 9 Dec 2004 14:17:33 -0000 Received: (qmail 88288 invoked by uid 500); 9 Dec 2004 14:16:27 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 88231 invoked by uid 500); 9 Dec 2004 14:16:26 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 88163 invoked by uid 99); 9 Dec 2004 14:16:25 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 09 Dec 2004 06:16:21 -0800 Received: (qmail 21384 invoked by uid 65534); 9 Dec 2004 14:16:19 -0000 Date: 9 Dec 2004 14:16:19 -0000 Message-ID: <20041209141619.21380.qmail@minotaur.apache.org> From: geoff@apache.org To: cvs@httpd.apache.org Subject: svn commit: r111386 - /httpd/httpd/trunk/CHANGES /httpd/httpd/trunk/include/httpd.h /httpd/httpd/trunk/modules/http/http_protocol.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: geoff Date: Thu Dec 9 06:16:16 2004 New Revision: 111386 URL: http://svn.apache.org/viewcvs?view=rev&rev=111386 Log: add response code 226 constant (HTTP_IM_USED) and status line ("226 IM Used"). PR 31128. 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=111386&p1=httpd/httpd/trunk/CHANGES&r1=111385&p2=httpd/httpd/trunk/CHANGES&r2=111386 ============================================================================== --- httpd/httpd/trunk/CHANGES (original) +++ httpd/httpd/trunk/CHANGES Thu Dec 9 06:16:16 2004 @@ -2,6 +2,10 @@ [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 ] + 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=111386&p1=httpd/httpd/trunk/include/httpd.h&r1=111385&p2=httpd/httpd/trunk/include/httpd.h&r2=111386 ============================================================================== --- httpd/httpd/trunk/include/httpd.h (original) +++ httpd/httpd/trunk/include/httpd.h Thu Dec 9 06:16:16 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 57 +#define RESPONSE_CODES 76 #define HTTP_CONTINUE 100 #define HTTP_SWITCHING_PROTOCOLS 101 @@ -440,6 +440,7 @@ #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=111386&p1=httpd/httpd/trunk/modules/http/http_protocol.c&r1=111385&p2=httpd/httpd/trunk/modules/http/http_protocol.c&r2=111386 ============================================================================== --- httpd/httpd/trunk/modules/http/http_protocol.c (original) +++ httpd/httpd/trunk/modules/http/http_protocol.c Thu Dec 9 06:16:16 2004 @@ -85,7 +85,26 @@ "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 @@ "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 @@ */ "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",