From 45535d4f3e3cfb83fbb32619668736b5e30e6aa0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 16 May 2005 21:00:49 +0000 Subject: [PATCH] Headers.java (parse): Include final character of line. * gnu/java/net/protocol/http/Headers.java (parse): Include final character of line. From-SVN: r99794 --- libjava/ChangeLog | 5 +++++ libjava/gnu/java/net/protocol/http/Headers.java | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 94cdae92fef8..c62950966310 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-05-16 Tom Tromey + + * gnu/java/net/protocol/http/Headers.java (parse): Include final + character of line. + 2005-05-16 Tom Tromey PR libgcj/21606: diff --git a/libjava/gnu/java/net/protocol/http/Headers.java b/libjava/gnu/java/net/protocol/http/Headers.java index 0db9a552a0f9..9968b2e77802 100644 --- a/libjava/gnu/java/net/protocol/http/Headers.java +++ b/libjava/gnu/java/net/protocol/http/Headers.java @@ -323,7 +323,10 @@ public class Headers if (c1 == ' ' || c1 == '\t') { // Continuation - value.append(line.substring(0, len - 1)); + int last = len - 1; + if (line.charAt(last) != '\r') + ++last; + value.append(line.substring(0, last)); } else { @@ -340,7 +343,10 @@ public class Headers di++; } while (di < len && line.charAt(di) == ' '); - value.append(line.substring(di, len - 1)); + int last = len - 1; + if (line.charAt(last) != '\r') + ++last; + value.append(line.substring(di, last)); } } }