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 ma...@apache.org on 2005/01/27 04:35:30 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util WebdavUtils.java

masonjm     2005/01/26 19:35:30

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        WebdavUtils.java
  Log:
  Fix for bug 33068. Thanks to John Rousseau
  
  Revision  Changes    Path
  1.33      +10 -8     jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java
  
  Index: WebdavUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/WebdavUtils.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- WebdavUtils.java	30 Dec 2004 13:38:59 -0000	1.32
  +++ WebdavUtils.java	27 Jan 2005 03:35:30 -0000	1.33
  @@ -271,8 +271,9 @@
       {
           String result = uri;
           
  -        int scopeLength = config.getScope().length();
  -        if (scopeLength > 0) {
  +        String scope = config.getScope();
  +        int scopeLength = scope.length();
  +        if (scopeLength > 0 && uri.startsWith(scope)) {
               result = uri.substring(scopeLength);
           }
           
  @@ -285,8 +286,9 @@
       {
           String result = uri;
           
  -        int scopeLength = context.getServletConfig().getScope().length();
  -        if (scopeLength > 0) {
  +        String scope = context.getServletConfig().getScope();
  +        int scopeLength = scope.length();
  +        if (scopeLength > 0 && uri.startsWith(scope)) {
               result = uri.substring(scopeLength);
           }
           
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org