keith 01/10/01 13:50:39
Modified: jk/doc AJPv13.html
jk/java/org/apache/ajp Ajp13.java RequestHandler.java
jk/native/common jk_ajp_common.c jk_ajp_common.h
Log:
DeltaV is now an IESG Proposed Standard.
Add the four new versioning methods.
Revision Changes Path
1.4 +5 -1 jakarta-tomcat-connectors/jk/doc/AJPv13.html
Index: AJPv13.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/doc/AJPv13.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AJPv13.html 2001/08/27 15:33:04 1.3
+++ AJPv13.html 2001/10/01 20:50:39 1.4
@@ -357,8 +357,12 @@
MOVE 12
LOCK 13
UNLOCK 14
-ACL 15
+ACL 15
REPORT 16
+VERSION-CONTROL 17
+CHECKIN 18
+CHECKOUT 19
+UNCHECKOUT 20
</PRE>
<P>
</DD>
1.16 +5 -1 jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java
Index: Ajp13.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/Ajp13.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Ajp13.java 2001/09/27 10:28:12 1.15
+++ Ajp13.java 2001/10/01 20:50:39 1.16
@@ -168,7 +168,11 @@
"LOCK",
"UNLOCK",
"ACL",
- "REPORT"
+ "REPORT",
+ "VERSION-CONTROL",
+ "CHECKIN",
+ "CHECKOUT",
+ "UNCHECKOUT"
};
// id's for common request headers
1.3 +6 -2
jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java
Index: RequestHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/RequestHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestHandler.java 2001/08/27 15:33:04 1.2
+++ RequestHandler.java 2001/10/01 20:50:39 1.3
@@ -148,8 +148,12 @@
"MOVE",
"LOCK",
"UNLOCK",
- "ACL",
- "REPORT"
+ "ACL",
+ "REPORT",
+ "VERSION-CONTROL",
+ "CHECKIN",
+ "CHECKOUT",
+ "UNCHECKOUT"
};
// id's for common request headers
1.13 +11 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_ajp_common.c 2001/09/14 22:30:04 1.12
+++ jk_ajp_common.c 2001/10/01 20:50:39 1.13
@@ -130,8 +130,16 @@
*sc = SC_M_UNLOCK;
} else if(0 == strcmp(method, "ACL")) {
*sc = SC_M_ACL;
- } else if(0 == strcmp(method, "REPORT")) {
- *sc = SC_M_REPORT;
+ } else if(0 == strcmp(method, "REPORT")) {
+ *sc = SC_M_REPORT;
+ } else if(0 == strcmp(method, "VERSION-CONTROL")) {
+ *sc = SC_M_VERSION_CONTROL;
+ } else if(0 == strcmp(method, "CHECKIN")) {
+ *sc = SC_M_CHECKIN;
+ } else if(0 == strcmp(method, "CHECKOUT")) {
+ *sc = SC_M_CHECKOUT;
+ } else if(0 == strcmp(method, "UNCHECKOUT")) {
+ *sc = SC_M_UNCHECKOUT;
} else {
rc = JK_FALSE;
}
1.10 +12 -4 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
Index: jk_ajp_common.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_ajp_common.h 2001/09/14 22:34:11 1.9
+++ jk_ajp_common.h 2001/10/01 20:50:39 1.10
@@ -93,7 +93,7 @@
/*
* Request methods, coded as numbers instead of strings.
* The list of methods was taken from Section 5.1.1 of RFC 2616,
- * RFC 2518, and the ACL IETF draft.
+ * RFC 2518, the ACL IETF draft, and the DeltaV IESG Proposed Standard.
* Method = "OPTIONS"
* | "GET"
* | "HEAD"
@@ -108,8 +108,12 @@
* | "MOVE"
* | "LOCK"
* | "UNLOCK"
- * | "ACL"
+ * | "ACL"
* | "REPORT"
+ * | "VERSION-CONTROL"
+ * | "CHECKIN"
+ * | "CHECKOUT"
+ * | "UNCHECKOUT"
*
*/
#define SC_M_OPTIONS (unsigned char)1
@@ -126,8 +130,12 @@
#define SC_M_MOVE (unsigned char)12
#define SC_M_LOCK (unsigned char)13
#define SC_M_UNLOCK (unsigned char)14
-#define SC_M_ACL (unsigned char)15
+#define SC_M_ACL (unsigned char)15
#define SC_M_REPORT (unsigned char)16
+#define SC_M_VERSION_CONTROL (unsigned char)17
+#define SC_M_CHECKIN (unsigned char)18
+#define SC_M_CHECKOUT (unsigned char)19
+#define SC_M_UNCHECKOUT (unsigned char)20
/*
