[Bedework-commit] webdav r234 - trunk/server/src/edu/rpi/cct/webdav/servlet/common

[svnadmin at bedework.org]

Author: douglm
Date: 2010-09-06 21:46:30 -0400 (Mon, 06 Sep 2010)
New Revision: 234

Modified:
   trunk/server/src/edu/rpi/cct/webdav/servlet/common/WebdavServlet.java
Log:
Handle the X-HTTP-Method-Override header in webdav/CalWS

Modified: trunk/server/src/edu/rpi/cct/webdav/servlet/common/WebdavServlet.java
===================================================================
--- trunk/server/src/edu/rpi/cct/webdav/servlet/common/WebdavServlet.java	2010-09-07 01:46:20 UTC (rev 233)
+++ trunk/server/src/edu/rpi/cct/webdav/servlet/common/WebdavServlet.java	2010-09-07 01:46:30 UTC (rev 234)
@@ -1,31 +1,3 @@
-/*
- Copyright (c) 2000-2005 University of Washington.  All rights reserved.
-
- Redistribution and use of this distribution in source and binary forms,
- with or without modification, are permitted provided that:
-
-   The above copyright notice and this permission notice appear in
-   all copies and supporting documentation;
-
-   The name, identifiers, and trademarks of the University of Washington
-   are not used in advertising or publicity without the express prior
-   written permission of the University of Washington;
-
-   Recipients acknowledge that this distribution is made available as a
-   research courtesy, "as is", potentially with defects, without
-   any obligation on the part of the University of Washington to
-   provide support, services, or repair;
-
-   THE UNIVERSITY OF WASHINGTON DISCLAIMS ALL WARRANTIES, EXPRESS OR
-   IMPLIED, WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT LIMITATION
-   ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE, AND IN NO EVENT SHALL THE UNIVERSITY OF
-   WASHINGTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-   DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-   PROFITS, WHETHER IN AN ACTION OF CONTRACT, TORT (INCLUDING
-   NEGLIGENCE) OR STRICT LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
-   THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
 /* **********************************************************************
     Copyright 2005 Rensselaer Polytechnic Institute. All worldwide rights reserved.
 
@@ -161,8 +133,12 @@
                                             getLogger(), debug);
       }
 
-      String methodName = req.getMethod();
+      String methodName = req.getHeader("X-HTTP-Method-Override");
 
+      if (methodName == null) {
+        methodName = req.getMethod();
+      }
+
       MethodBase method = intf.getMethod(methodName);
 
       //resp.addHeader("DAV", intf.getDavHeader());