Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 47502 invoked by uid 500); 1 Oct 2001 20:00:05 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 47483 invoked by uid 500); 1 Oct 2001 20:00:05 -0000 Delivered-To: apmail-jakarta-tomcat-cvs@apache.org Date: 1 Oct 2001 19:58:08 -0000 Message-ID: <20011001195808.19274.qmail@icarus.apache.org> From: keith@apache.org To: jakarta-tomcat-cvs@apache.org Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp13.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N keith 01/10/01 12:58:08 Modified: src/doc AJPv13.html src/native/mod_jk/common jk_ajp13.c src/share/org/apache/tomcat/modules/server Ajp13.java Log: DeltaV is now an IESG Proposed Standard. Add the four new versioning methods. Revision Changes Path 1.4 +6 -1 jakarta-tomcat/src/doc/AJPv13.html Index: AJPv13.html =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/doc/AJPv13.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AJPv13.html 2001/02/07 23:51:06 1.3 +++ AJPv13.html 2001/10/01 19:58:08 1.4 @@ -356,7 +356,12 @@ MOVE 12 LOCK 13 UNLOCK 14 -ACL 15 +ACL 15 +REPORT 16 +VERSION-CONTROL 17 +CHECKIN 18 +CHECKOUT 19 +UNCHECKOUT 20

1.7 +21 -5 jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c Index: jk_ajp13.c =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_ajp13.c 2001/08/23 03:08:39 1.6 +++ jk_ajp13.c 2001/10/01 19:58:08 1.7 @@ -83,7 +83,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" @@ -99,7 +99,11 @@ * | "LOCK" * | "UNLOCK" * | "ACL" - * | "REPORT" + * | "REPORT" + * | "VERSION-CONTROL" + * | "CHECKIN" + * | "CHECKOUT" + * | "UNCHECKOUT" * */ #define SC_M_OPTIONS (unsigned char)1 @@ -117,7 +121,11 @@ #define SC_M_LOCK (unsigned char)13 #define SC_M_UNLOCK (unsigned char)14 #define SC_M_ACL (unsigned char)15 -#define SC_M_REPORT (unsigned char)16 +#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 /* @@ -246,7 +254,15 @@ } else if(0 == strcmp(method, "ACL")) { *sc = SC_M_ACL; } else if(0 == strcmp(method, "REPORT")) { - *sc = SC_M_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.29 +5 -1 jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java Index: Ajp13.java =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- Ajp13.java 2001/09/18 23:24:46 1.28 +++ Ajp13.java 2001/10/01 19:58:08 1.29 @@ -170,7 +170,11 @@ "LOCK", "UNLOCK", "ACL", - "REPORT" + "REPORT", + "VERSION-CONTROL", + "CHECKIN", + "CHECKOUT", + "UNCHECKOUT" }; // Translates integer codes to request header names