fielding 98/11/09 23:30:09
Modified: . STATUS
src CHANGES
src/include httpd.h
src/main http_protocol.c
Log:
Added the last two WebDAV status codes of 424 (Failed Dependency)
and 507 (Insufficient Storage) for use by third-party modules.
Revision Changes Path
1.536 +0 -2 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- STATUS 1998/11/10 06:10:24 1.535
+++ STATUS 1998/11/10 07:30:05 1.536
@@ -125,8 +125,6 @@
Needs patch:
- * Roy: Need to add updated WebDAV status codes from latest draft.
-
* Ralf: mod_so doesn't correctly initialise modules. For instance
the handlers of mod_perl are not initialised.
An ap_init_modules() could be done from mod_so but this is too much.
1.1144 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1143
retrieving revision 1.1144
diff -u -r1.1143 -r1.1144
--- CHANGES 1998/11/10 06:10:25 1.1143
+++ CHANGES 1998/11/10 07:30:06 1.1144
@@ -13,6 +13,10 @@
was changed to show more information about the suEXEC setup.
[Lars Eilebrecht] PR#3316, 3357, 3361
+ *) Added the last two WebDAV status codes of 424 (Failed Dependency)
+ and 507 (Insufficient Storage) for use by third-party modules.
+ [Roy Fielding]
+
*) Enabled all of the WebDAV method names for use by third-party
modules, Limit, and Script directives. That includes PATCH,
PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, and UNLOCK.
1.252 +3 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- httpd.h 1998/11/08 09:51:09 1.251
+++ httpd.h 1998/11/10 07:30:07 1.252
@@ -447,7 +447,7 @@
* all of the potential response status-lines (a sparse table).
* A future version should dynamically generate the table at startup.
*/
-#define RESPONSE_CODES 54
+#define RESPONSE_CODES 55
#define HTTP_CONTINUE 100
#define HTTP_SWITCHING_PROTOCOLS 101
@@ -487,6 +487,7 @@
#define HTTP_EXPECTATION_FAILED 417
#define HTTP_UNPROCESSABLE_ENTITY 422
#define HTTP_LOCKED 423
+#define HTTP_FAILED_DEPENDENCY 424
#define HTTP_INTERNAL_SERVER_ERROR 500
#define HTTP_NOT_IMPLEMENTED 501
#define HTTP_BAD_GATEWAY 502
@@ -494,6 +495,7 @@
#define HTTP_GATEWAY_TIME_OUT 504
#define HTTP_VERSION_NOT_SUPPORTED 505
#define HTTP_VARIANT_ALSO_VARIES 506
+#define HTTP_INSUFFICIENT_STORAGE 507
#define HTTP_NOT_EXTENDED 510
#define DOCUMENT_FOLLOWS HTTP_OK
1.249 +15 -2 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- http_protocol.c 1998/11/08 09:51:11 1.248
+++ http_protocol.c 1998/11/10 07:30:08 1.249
@@ -1154,7 +1154,8 @@
"421 unused",
"422 Unprocessable Entity",
"423 Locked",
-#define LEVEL_500 43
+ "424 Failed Dependency",
+#define LEVEL_500 44
"500 Internal Server Error",
"501 Method Not Implemented",
"502 Bad Gateway",
@@ -1162,7 +1163,7 @@
"504 Gateway Time-out",
"505 HTTP Version Not Supported",
"506 Variant Also Negotiates"
- "507 unused",
+ "507 Insufficient Storage"
"508 unused",
"509 unused",
"510 Not Extended",
@@ -2425,6 +2426,18 @@
ap_bputs("The requested resource is currently locked.\n"
"The lock must be released or proper identification\n"
"given before the method can be applied.\n", fd);
+ break;
+ case HTTP_FAILED_DEPENDENCY:
+ ap_bputs("The method could not be performed on the resource\n"
+ "because the requested action depended on another\n"
+ "action and that other action failed.\n", fd);
+ break;
+ case HTTP_INSUFFICIENT_STORAGE:
+ ap_bputs("The method could not be performed on the resource\n"
+ "because the server is unable to store the\n"
+ "representation needed to successfully complete the\n"
+ "request. There is insufficient free space left in\n"
+ "your storage allocation.\n", fd);
break;
case HTTP_SERVICE_UNAVAILABLE:
ap_bputs("The server is temporarily unable to service your\n"