Index: src/java/org/apache/commons/httpclient/HttpParser.java =================================================================== --- src/java/org/apache/commons/httpclient/HttpParser.java (revision 533384) +++ src/java/org/apache/commons/httpclient/HttpParser.java (working copy) @@ -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; } /** Index: src/java/org/apache/commons/httpclient/HttpMethodBase.java =================================================================== --- src/java/org/apache/commons/httpclient/HttpMethodBase.java (revision 533384) +++ src/java/org/apache/commons/httpclient/HttpMethodBase.java (working copy) @@ -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); }