Return-Path: 
 <httpclient-commits-return-107-apmail-jakarta-httpclient-commits-archive=www.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-httpclient-commits-archive@www.apache.org
Received: (qmail 50973 invoked from network); 20 Apr 2005 19:17:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 20 Apr 2005 19:17:53 -0000
Received: (qmail 5706 invoked by uid 500); 20 Apr 2005 19:18:00 -0000
Mailing-List: contact httpclient-commits-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:httpclient-commits-help@jakarta.apache.org>
List-Unsubscribe: <mailto:httpclient-commits-unsubscribe@jakarta.apache.org>
List-Post: <mailto:httpclient-commits@jakarta.apache.org>
List-Id: <httpclient-commits.jakarta.apache.org>
Reply-To: httpclient-dev@jakarta.apache.org
Delivered-To: mailing list httpclient-commits@jakarta.apache.org
Received: (qmail 5692 invoked by uid 500); 20 Apr 2005 19:18:00 -0000
Delivered-To: apmail-jakarta-httpclient-cvs@jakarta.apache.org
Received: (qmail 5688 invoked by uid 99); 20 Apr 2005 19:18:00 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 20 Apr 2005 12:17:59 -0700
Received: (qmail 50959 invoked by uid 65534); 20 Apr 2005 19:17:51 -0000
Message-ID: <20050420191751.50958.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r162038 -
 /jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
 /jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
Date: Wed, 20 Apr 2005 19:17:50 -0000
To: httpclient-cvs@jakarta.apache.org
From: olegk@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: olegk
Date: Wed Apr 20 12:17:46 2005
New Revision: 162038

URL: http://svn.apache.org/viewcvs?rev=3D162038&view=3Drev
Log:
Always use chunk encoding when content length is not known

Modified:
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpClientConnection.java
    jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpServerConnection.java

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/imp=
l/DefaultHttpClientConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/DefaultHttpClientConnection.java?rev=3D162038&r1=
=3D162037&r2=3D162038&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpClientConnection.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpClientConnection.java Wed Apr 20 12:17:46 2005
@@ -190,12 +190,13 @@
         }
         HttpOutgoingEntity entity =3D (HttpOutgoingEntity)request.getEntit=
y();
         HttpVersion ver =3D request.getRequestLine().getHttpVersion();
-        if (entity.isChunked() && ver.lessEquals(HttpVersion.HTTP_1_0)) {
+        boolean chunked =3D entity.isChunked() || entity.getContentLength(=
) < 0; =20
+        if (chunked && ver.lessEquals(HttpVersion.HTTP_1_0)) {
             throw new ProtocolException(
                     "Chunked transfer encoding not allowed for " + ver);
         }
         OutputStream outstream =3D new HttpDataOutputStream(this.datatrans=
mitter);
-        if (entity.isChunked()) {
+        if (chunked) {
             outstream =3D new ChunkedOutputStream(outstream);
         }
         entity.writeTo(outstream);

Modified: jakarta/httpclient/trunk/http-common/src/java/org/apache/http/imp=
l/DefaultHttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpclient/trunk/http-common/src=
/java/org/apache/http/impl/DefaultHttpServerConnection.java?rev=3D162038&r1=
=3D162037&r2=3D162038&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpServerConnection.java (original)
+++ jakarta/httpclient/trunk/http-common/src/java/org/apache/http/impl/Defa=
ultHttpServerConnection.java Wed Apr 20 12:17:46 2005
@@ -205,12 +205,13 @@
         }
         HttpOutgoingEntity entity =3D (HttpOutgoingEntity)response.getEnti=
ty();
         HttpVersion ver =3D response.getStatusLine().getHttpVersion();
-        if (entity.isChunked() && ver.lessEquals(HttpVersion.HTTP_1_0)) {
+        boolean chunked =3D entity.isChunked() || entity.getContentLength(=
) < 0; =20
+        if (chunked && ver.lessEquals(HttpVersion.HTTP_1_0)) {
             throw new ProtocolException(
                     "Chunked transfer encoding not allowed for " + ver);
         }
         OutputStream outstream =3D new HttpDataOutputStream(this.datatrans=
mitter);
-        if (entity.isChunked()) {
+        if (chunked) {
             outstream =3D new ChunkedOutputStream(outstream);
         }
         entity.writeTo(outstream);