danmil 01/01/28 12:49:55
Modified: src/native/mod_jk/common jk_ajp13.c
src/share/org/apache/tomcat/modules/server Ajp13.java
. changes3.3
Log:
Adding support for WEBDAV methods to Ajp13.
Contributed by Keith Wannamaker ([EMAIL PROTECTED])
Revision Changes Path
1.3 +30 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_ajp13.c 2000/11/10 18:48:50 1.2
+++ jk_ajp13.c 2001/01/28 20:49:54 1.3
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Experimental bi-directionl protocol handler. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
@@ -83,6 +83,7 @@
/*
* Request methods, coded as numbers instead of strings.
* The list of methods was taken from Section 5.1.1 of RFC 2616
+ * and RFC 2518
* Method = "OPTIONS"
* | "GET"
* | "HEAD"
@@ -90,6 +91,13 @@
* | "PUT"
* | "DELETE"
* | "TRACE"
+ * | "PROPFIND"
+ * | "PROPPATCH"
+ * | "MKCOL"
+ * | "COPY"
+ * | "MOVE"
+ * | "LOCK"
+ * | "UNLOCK"
*
*/
#define SC_M_OPTIONS (unsigned char)1
@@ -99,6 +107,13 @@
#define SC_M_PUT (unsigned char)5
#define SC_M_DELETE (unsigned char)6
#define SC_M_TRACE (unsigned char)7
+#define SC_M_PROPFIND (unsigned char)8
+#define SC_M_PROPPATCH (unsigned char)9
+#define SC_M_MKCOL (unsigned char)10
+#define SC_M_COPY (unsigned char)11
+#define SC_M_MOVE (unsigned char)12
+#define SC_M_LOCK (unsigned char)13
+#define SC_M_UNLOCK (unsigned char)14
/*
@@ -210,6 +225,20 @@
*sc = SC_M_OPTIONS;
} else if(0 == strcmp(method, "TRACE")) {
*sc = SC_M_TRACE;
+ } else if(0 == strcmp(method, "PROPFIND")) {
+ *sc = SC_M_PROPFIND;
+ } else if(0 == strcmp(method, "PROPPATCH")) {
+ *sc = SC_M_PROPPATCH;
+ } else if(0 == strcmp(method, "MKCOL")) {
+ *sc = SC_M_MKCOL;
+ } else if(0 == strcmp(method, "COPY")) {
+ *sc = SC_M_COPY;
+ } else if(0 == strcmp(method, "MOVE")) {
+ *sc = SC_M_MOVE;
+ } else if(0 == strcmp(method, "LOCK")) {
+ *sc = SC_M_LOCK;
+ } else if(0 == strcmp(method, "UNLOCK")) {
+ *sc = SC_M_UNLOCK;
} else {
rc = JK_FALSE;
}
1.9 +8 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Ajp13.java 2001/01/11 02:34:20 1.8
+++ Ajp13.java 2001/01/28 20:49:54 1.9
@@ -141,7 +141,14 @@
"POST",
"PUT",
"DELETE",
- "TRACE"
+ "TRACE",
+ "PROPFIND",
+ "PROPPATCH",
+ "MKCOL",
+ "COPY",
+ "MOVE",
+ "LOCK",
+ "UNLOCK"
};
// Translates integer codes to request header names
1.6 +1 -0 jakarta-tomcat/changes3.3
Index: changes3.3
===================================================================
RCS file: /home/cvs/jakarta-tomcat/changes3.3,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes3.3 2001/01/01 00:17:22 1.5
+++ changes3.3 2001/01/28 20:49:54 1.6
@@ -13,6 +13,7 @@
- refactoring of MessageBytes
- refactoring of AJP1.3 ( Dan Milstein )
+ AJP1.3 support for Webdav methods ( Keith Wannamaker )
- merged the improved error handling from 3.2 ( Larry )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
