markt 2004/02/22 14:35:35
Modified: catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
Log:
Fix bug 27100.
- Remove lock obsfucation functionality as it breaks a number of webdav clients and
does not appear to be covered by the webdav spec.
- Reported by Ryan Dewell.
- Ported from TC5.
Revision Changes Path
1.34 +9 -24
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WebdavServlet.java 13 Feb 2004 22:21:04 -0000 1.33
+++ WebdavServlet.java 22 Feb 2004 22:35:35 -0000 1.34
@@ -1298,7 +1298,7 @@
generatedXML.writeElement(null, "lockdiscovery",
XMLWriter.OPENING);
- lock.toXML(generatedXML, true);
+ lock.toXML(generatedXML);
generatedXML.writeElement(null, "lockdiscovery",
XMLWriter.CLOSING);
@@ -2703,15 +2703,6 @@
* append an XML fragment to the given XML writer.
*/
public void toXML(XMLWriter generatedXML) {
- toXML(generatedXML, false);
- }
-
-
- /**
- * Get an XML representation of this lock token. This method will
- * append an XML fragment to the given XML writer.
- */
- public void toXML(XMLWriter generatedXML, boolean showToken) {
generatedXML.writeElement(null, "activelock", XMLWriter.OPENING);
@@ -2741,17 +2732,11 @@
generatedXML.writeElement(null, "timeout", XMLWriter.CLOSING);
generatedXML.writeElement(null, "locktoken", XMLWriter.OPENING);
- if (showToken) {
- Enumeration tokensList = tokens.elements();
- while (tokensList.hasMoreElements()) {
- generatedXML.writeElement(null, "href", XMLWriter.OPENING);
- generatedXML.writeText("opaquelocktoken:"
- + tokensList.nextElement());
- generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
- }
- } else {
+ Enumeration tokensList = tokens.elements();
+ while (tokensList.hasMoreElements()) {
generatedXML.writeElement(null, "href", XMLWriter.OPENING);
- generatedXML.writeText("opaquelocktoken:dummytoken");
+ generatedXML.writeText("opaquelocktoken:"
+ + tokensList.nextElement());
generatedXML.writeElement(null, "href", XMLWriter.CLOSING);
}
generatedXML.writeElement(null, "locktoken", XMLWriter.CLOSING);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
