Automated merge with https://gss.googlecode.com/hg/

[pithos] / src / gr / ebs / gss / server / rest / RequestHandler.java

diff --git a/src/gr/ebs/gss/server/rest/RequestHandler.java b/src/gr/ebs/gss/server/rest/RequestHandler.java
index 4e2c78e..84270b6 100644 (file)
--- a/src/gr/ebs/gss/server/rest/RequestHandler.java
+++ b/src/gr/ebs/gss/server/rest/RequestHandler.java
@@ -744,10 +744,10 @@ public class RequestHandler extends Webdav {
        }
 
        /**
-        * Reject illegal resource names, like '.' or '..'.
+        * Reject illegal resource names, like '.' or '..' or resource names containing '/'.
         */
        protected boolean isValidResourceName(String name) {
-               if (".".equals(name) || "..".equals(name))
+               if (".".equals(name) || "..".equals(name) || name.contains("/"))
                        return false;
                return true;
        }