You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ro...@apache.org on 2007/04/28 20:19:30 UTC
svn commit: r533405 - in /jakarta/commons/proper/httpclient/trunk:
release_notes.txt src/java/org/apache/commons/httpclient/HttpMethodBase.java
src/java/org/apache/commons/httpclient/HttpParser.java
Author: rolandw
Date: Sat Apr 28 11:19:29 2007
New Revision: 533405
URL: http://svn.apache.org/viewvc?view=rev&rev=533405
Log:
HTTPCLIENT-650 and updated release notes
Modified:
jakarta/commons/proper/httpclient/trunk/release_notes.txt
jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java
jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpParser.java
Modified: jakarta/commons/proper/httpclient/trunk/release_notes.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/httpclient/trunk/release_notes.txt?view=diff&rev=533405&r1=533404&r2=533405
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/release_notes.txt (original)
+++ jakarta/commons/proper/httpclient/trunk/release_notes.txt Sat Apr 28 11:19:29 2007
@@ -3,6 +3,9 @@
* [HTTPCLIENT-645] - Cookie#compare() changed to do a simple case-sensitive string comparison
when comparing path attributes instead of using a static instance of RuleBasedCollator
Contributed by Oleg Kalnichevski <olegk at apache.org>
+* [HTTPCLIENT-650] - Wire log for headers written one by one while parsing
+ instead of all at once afterwards, which fails on parse errors.
+ Contributed by Roland Weber <rolandw at apache.org>
Release 3.1 RC 1
-------------------
Modified: jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java?view=diff&rev=533405&r1=533404&r2=533405
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpMethodBase.java Sat Apr 28 11:19:29 2007
@@ -1926,11 +1926,7 @@
Header[] headers = HttpParser.parseHeaders(
conn.getResponseInputStream(), getParams().getHttpElementCharset());
- if (Wire.HEADER_WIRE.enabled()) {
- for (int i = 0; i < headers.length; i++) {
- Wire.HEADER_WIRE.input(headers[i].toExternalForm());
- }
- }
+ // Wire logging moved to HttpParser
getResponseHeaderGroup().setHeaders(headers);
}
Modified: jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpParser.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpParser.java?view=diff&rev=533405&r1=533404&r2=533405
==============================================================================
--- jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpParser.java (original)
+++ jakarta/commons/proper/httpclient/trunk/src/java/org/apache/commons/httpclient/HttpParser.java Sat Apr 28 11:19:29 2007
@@ -120,7 +120,17 @@
}
}
}
- return EncodingUtil.getString(rawdata, 0, len - offset, charset);
+ final String result =
+ EncodingUtil.getString(rawdata, 0, len - offset, charset);
+ if (Wire.HEADER_WIRE.enabled()) {
+ String logoutput = result;
+ if (offset == 2)
+ logoutput = result + "\r\n";
+ else if (offset == 1)
+ logoutput = result + "\n";
+ Wire.HEADER_WIRE.input(logoutput);
+ }
+ return result;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org