aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>2001-03-19 15:31:14 -0800
committerPer Bothner <bothner@gcc.gnu.org>2001-03-19 15:31:14 -0800
commitb90f4049d36e101e2090dd2c1a0595bdb3790ec2 (patch)
tree7412a9857285914e256aa7c67d48262bb29994a1 /libjava
parent86c9776ba2553c7c7938c07311436cc9604ef34c (diff)
downloadgcc-b90f4049d36e101e2090dd2c1a0595bdb3790ec2.zip
gcc-b90f4049d36e101e2090dd2c1a0595bdb3790ec2.tar.gz
gcc-b90f4049d36e101e2090dd2c1a0595bdb3790ec2.tar.bz2
URLStreamHandler.java (parseURL): Fix bug which would "canonicalize" "../../xxx" to "/xxx".
* java/net/URLStreamHandler.java (parseURL): Fix bug which would "canonicalize" "../../xxx" to "/xxx". From-SVN: r40641
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/net/URLStreamHandler.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7e1049b..e3c5c24 100644
--- 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 0060b4e..2b646b4 100644
--- 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());