Author: dkulp Date: Mon Jan 19 12:45:30 2009 New Revision: 735801 URL: http://svn.apache.org/viewvc?rev=735801&view=rev Log: Merged revisions 727794 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r727794 | dkulp | 2008-12-18 14:18:05 -0500 (Thu, 18 Dec 2008) | 9 lines Merged revisions 727445 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r727445 | dkulp | 2008-12-17 12:17:28 -0500 (Wed, 17 Dec 2008) | 2 lines Add ability to configure keep-alive params ........ ................ Modified: cxf/branches/2.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 19 12:45:30 2009 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,733587 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,733582 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,733587 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,733582 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=735801&r1=735800&r2=735801&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Mon Jan 19 12:45:30 2009 @@ -395,6 +395,8 @@ if (policy.isSetHonorKeepAlive() && !policy.isHonorKeepAlive()) { headers.put("Connection", createMutableList("close")); + } else if (policy.isSetKeepAliveParameters()) { + headers.put("Keep-Alive", createMutableList(policy.getKeepAliveParameters())); } Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java?rev=735801&r1=735800&r2=735801&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/policy/PolicyUtils.java Mon Jan 19 12:45:30 2009 @@ -518,6 +518,9 @@ if (compatible) { compatible &= p1.isSuppressClientSendErrors() == p2.isSuppressClientSendErrors(); } + if (compatible) { + compatible &= compatible(p1.getKeepAliveParameters(), p2.getKeepAliveParameters()); + } return compatible; } @@ -553,6 +556,12 @@ } else if (p2.isSetHonorKeepAlive()) { p.setHonorKeepAlive(p2.isHonorKeepAlive()); } + if (p1.isSetKeepAliveParameters()) { + p.setKeepAliveParameters(p1.getKeepAliveParameters()); + } else if (p2.isSetKeepAliveParameters()) { + p.setKeepAliveParameters(p2.getKeepAliveParameters()); + } + if (p1.isSetReceiveTimeout() || p2.isSetReceiveTimeout()) { p.setReceiveTimeout(Math.min(p1.getReceiveTimeout(), p2.getReceiveTimeout())); } @@ -591,7 +600,8 @@ : p1.getCacheControl().value().equals(p2.getCacheControl().value())) && equals(p1.getContentEncoding(), p2.getContentEncoding()) && equals(p1.getContentLocation(), p2.getContentLocation()) - && equals(p1.getContentType(), p2.getContentType()); + && equals(p1.getContentType(), p2.getContentType()) + && equals(p1.getKeepAliveParameters(), p2.getKeepAliveParameters()); if (!result) { return false; } Modified: cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd?rev=735801&r1=735800&r2=735801&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd (original) +++ cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd Mon Jan 19 12:45:30 2009 @@ -85,7 +85,21 @@ </xs:documentation> </xs:annotation> </xs:attribute> - + <xs:attribute name="KeepAliveParameters" type="xs:string" use="optional"> + <xs:annotation> + <xs:documentation> + If KeepAlive connections are turned on, this allows sending additional + parameters back to the client via the Keep-Alive header. Common + parameters are timeout and max to specify how long the client should + hold open the connection and how many connections to hold open. Different + clients may have different defaults. For Java HTTPUrlConnection, the + defaults would be timeout=5, max=5 + + Example: timeout=60, max=5; + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="RedirectURL" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>
