You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/10/15 10:58:45 UTC
svn commit: r1398224 - in /cxf/branches/2.4.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Author: ffang
Date: Mon Oct 15 08:58:45 2012
New Revision: 1398224
URL: http://svn.apache.org/viewvc?rev=1398224&view=rev
Log:
Merged revisions 1398217 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1398217 | ffang | 2012-10-15 16:48:20 +0800 (一, 15 10 2012) | 16 lines
Merged revisions 1398214 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................
r1398214 | ffang | 2012-10-15 16:34:24 +0800 (一, 15 10 2012) | 9 lines
Merged revisions 1398200 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1398200 | ffang | 2012-10-15 14:57:20 +0800 (一, 15 10 2012) | 1 line
[CXF-4555]enable http:conduit to configure the chunk size
........
................
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1398217
Merged /cxf/trunk:r1398200
Merged /cxf/branches/2.6.x-fixes:r1398214
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1398224&r1=1398223&r2=1398224&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Mon Oct 15 08:58:45 2012
@@ -529,7 +529,6 @@ public class HTTPConduit
connection.setChunkedStreamingMode(-1);
}
}
-
cookies.writeToMessageHeaders(message);
// The trust decision is relegated to after the "flushing" of the
@@ -1317,7 +1316,8 @@ public class HTTPConduit
@Override
public void thresholdReached() {
if (chunking) {
- connection.setChunkedStreamingMode(-1);
+ connection.setChunkedStreamingMode(
+ HTTPConduit.this.getClient().getChunkLength());
}
}
Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=1398224&r1=1398223&r2=1398224&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Mon Oct 15 08:58:45 2012
@@ -239,7 +239,11 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
-
+ <xs:attribute name="ChunkLength" type="ptp:ParameterizedInt" use="optional" default="-1">
+ <xs:annotation>
+ <xs:documentation>Specifies the chunk length for a HttpURLConnection. This value is used in java.net.HttpURLConnection.setChunkedStreamingMode(int chunklen). chunklen indicates the number of bytes to write in each chunk. If chunklen is less than or equal to zero, a default value will be used.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="Accept" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>