URLStreamHandler.java (parseURL): Fix bug which would "canonicalize" "../../xxx"...

	* java/net/URLStreamHandler.java (parseURL):  Fix bug which would
	"canonicalize" "../../xxx" to "/xxx".

From-SVN: r40641

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7e1049b8d2500f515c2cf53c8512497d1101a43b..e3c5c245e00b207c1d1b949125266ef192d1ce87 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-19  Per Bothner  <per@bothner.com>
+
+       * java/net/URLStreamHandler.java (parseURL):  Fix bug which would
+       "canonicalize" "../../xxx" to "/xxx".
+
 2001-03-19  Mark Wielaard <mark@klomp.org>
 
        * java/util/ArrayList.java: Remove RCS keywords from comments

diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java
index 0060b4ea688bceca38e16bd9f1d604caa928602d..2b646b44a29a444ace986c75dcbcda47a0819935 100644 (file)
--- a/libjava/java/net/URLStreamHandler.java
+++ b/libjava/java/net/URLStreamHandler.java
@@ -111,7 +111,7 @@ public abstract class URLStreamHandler
        if (previous >= 0)
          file = file.substring(0, previous) + file.substring(index + 3);
        else
-         file = file.substring(index + 3);
+         break;
       }
     
     u.set(u.getProtocol(), host, port, file, u.getRef());