> Just a reminder to make sure this doesn't fall off the radar ;-) yeah, sorry about that. call it day job encroachment :)
here's a patch against current HEAD (trunk?). I'll give it a day or two to marinate and commit before the week is out if there are no complaints. fwiw, the perl-framework tests look ok, and I've double-checked the slot accounting. --Geoff
Index: CHANGES =================================================================== --- CHANGES (revision 110094) +++ CHANGES (working copy) @@ -2,6 +2,9 @@ [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") [Garrett Rooney <rooneg electricjellyfish.net>] + *) worker MPM: Fix a problem which could cause httpd processes to remain active after shutdown. [Jeff Trawick] Index: modules/http/http_protocol.c =================================================================== --- modules/http/http_protocol.c (revision 110103) +++ modules/http/http_protocol.c (working copy) @@ -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", Index: include/httpd.h =================================================================== --- include/httpd.h (revision 110103) +++ include/httpd.h (working copy) @@ -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