You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by cm...@apache.org on 2002/03/02 17:07:35 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method AbstractMultistatusResponseMethod.java
cmlenz 02/03/02 08:07:35
Modified: src/webdav/server/org/apache/slide/webdav/method Tag:
SLIDE_1_0 AbstractMultistatusResponseMethod.java
Log:
Porting bugfixes/enhancements from the HEAD branch:
- Committed by juergen, 02/01/03 02:51:03
"I18N URL encoding fixes. Please see separate e-mail for details."
- Committed by juergen, 02/02/21 09:35:53
"if the client does not pass a destination URI (for move/copy) a 'bad
request' (400) is returned now."
Revision Changes Path
No revision
No revision
1.11.2.1 +9 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java
Index: AbstractMultistatusResponseMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- AbstractMultistatusResponseMethod.java 4 Sep 2001 12:04:25 -0000 1.11
+++ AbstractMultistatusResponseMethod.java 2 Mar 2002 16:07:35 -0000 1.11.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.11 2001/09/04 12:04:25 juergen Exp $
- * $Revision: 1.11 $
- * $Date: 2001/09/04 12:04:25 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/AbstractMultistatusResponseMethod.java,v 1.11.2.1 2002/03/02 16:07:35 cmlenz Exp $
+ * $Revision: 1.11.2.1 $
+ * $Date: 2002/03/02 16:07:35 $
*
* ====================================================================
*
@@ -146,6 +146,11 @@
destinationUri = req.getHeader("Destination");
+ if (destinationUri == null) {
+ resp.setStatus(WebdavStatus.SC_BAD_REQUEST);
+ throw new WebdavException(WebdavStatus.SC_BAD_REQUEST); // that's it
+ }
+
int protocolIndex = destinationUri.indexOf("://");
if (protocolIndex >= 0) {
// if the Destination URL contains the protocol, we can safely
@@ -178,7 +183,7 @@
}
}
- destinationUri = WebdavUtils.decodeURL(destinationUri);
+ destinationUri = WebdavUtils.decodeURL(WebdavUtils.fixTomcatURL(destinationUri));
String contextPath = req.getContextPath();
if ((contextPath != null) &&
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>