You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/26 23:35:18 UTC
svn commit: r1732569 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
test/src/org/apache/jmeter/protocol/http/control/
test/src/org/apache/jmeter/protocol/http/sampler/ xdocs/
Author: pmouawad
Date: Fri Feb 26 22:35:18 2016
New Revision: 1732569
URL: http://svn.apache.org/viewvc?rev=1732569&view=rev
Log:
Upgrade to HttpClient/httpmime 4.5.2 which fixes at the same time:
- Bug 58881 - HTTP Request : HTTPHC4Impl shows exception when server uses "deflate" compression
- Bug 58583 - HTTP client fails to close connection if server misbehaves by not sending "connection: close", violating HTTP RFC 2616 / RFC 7230
- Bug 56358 - Cookie manager supports cross port cookies and RFC6265
- Bug 57319 - Upgrade to HttpClient 4.5.2
Bugzilla Id: 57319
Modified:
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Feb 26 22:35:18 2016
@@ -166,16 +166,16 @@ hamcrest-core.jar = hamcrest-
hamcrest-core.md5 = 6393363b47ddcbba82321110c3e07519
# Apache HttpClient 4.x
-httpclient.version = 4.5.1
+httpclient.version = 4.5.2
#
httpclient.jar = httpclient-${httpclient.version}.jar
httpclient.loc = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.md5 = 53cad957821a4bacaf9e108af24e6f90
+httpclient.md5 = e0a45df625cb96b69505e59bb25a0189
# Required for HttpClient
httpmime.jar = httpmime-${httpclient.version}.jar
httpmime.loc = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
-httpmime.md5 = 2ea8e5d4753d0231620062e225de4162
+httpmime.md5 = 336fa980f7527be719fa997f5df8046f
# Required for HttpClient
httpcore.version = 4.4.4
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Feb 26 22:35:18 2016
@@ -64,9 +64,9 @@
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
+ <classpathentry kind="lib" path="lib/httpclient-4.5.2.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.4.jar"/>
- <classpathentry kind="lib" path="lib/httpmime-4.5.1.jar"/>
+ <classpathentry kind="lib" path="lib/httpmime-4.5.2.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.3.jar"/>
<classpathentry kind="lib" path="lib/jodd-core-3.6.7.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 26 22:35:18 2016
@@ -22,9 +22,9 @@ excalibur-logger-1.1.jar
freemarker-2.3.23.jar
hamcrest-core-1.3.jar
geronimo*.jar
-httpclient-4.5.1.jar
+httpclient-4.5.2.jar
httpcore-4.4.4.jar
-httpmime-4.5.1.jar
+httpmime-4.5.2.jar
jcharts-0.7.5.jar
jdom-1.1.3.jar
jms*.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Feb 26 22:35:18 2016
@@ -170,7 +170,7 @@ junit 4.12
-----------
- unit tests, JUnit sampler
-HttpComponents (HttpComponents Core 4.x and HttpComponents Client 4.x)
+HttpComponents (HttpComponents Core 4.4.x and HttpComponents Client 4.5.x)
-----------
http://hc.apache.org/
- httpclient 4 implementation for HTTP sampler
Modified: jmeter/trunk/licenses/bin/README.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Fri Feb 26 22:35:18 2016
@@ -20,9 +20,9 @@ commons-net-3.4.jar
commons-pool2-2.4.2.jar
excalibur-logger-1.1.jar
geronimo-jms_1.1_spec-1.1.1.jar
-httpclient-4.5.1.jar
+httpclient-4.5.2.jar
httpcore-4.4.4.jar
-httpmime-4.5.1.jar
+httpmime-4.5.2.jar
jorphan.jar (part of JMeter)
logkit-2.0.jar
oro-2.0.8.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Feb 26 22:35:18 2016
@@ -75,7 +75,7 @@ under the License.
<excalibur-logger.version>1.1</excalibur-logger.version>
<freemarker.version>2.3.23</freemarker.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
- <httpclient.version>4.5.1</httpclient.version>
+ <httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java Fri Feb 26 22:35:18 2016
@@ -552,23 +552,17 @@ public class TestCookieManager extends J
assertEquals("/",man.get(2).getPath());
String s = man.getCookieHeaderForURL(url);
- // FIXME Enable when HTTPCLIENT 4.5.2 is available
// With ignore policy, s is null as no match will occur,
// getCookieHeaderForURL will return null
- //assertNull(s);
+ assertNull(s);
- // Remove this when HTTPCLIENT 4.5.2 is available
- assertTrue(s.length()==0);
-
HC4CookieHandler cookieHandler = (HC4CookieHandler) man.getCookieHandler();
List<org.apache.http.cookie.Cookie> c =
cookieHandler.getCookiesForUrl(man.getCookies(), url,
CookieManager.ALLOW_VARIABLE_COOKIES);
assertNotNull(c); // Make sure variable is used
- // FIXME Enable when HTTPCLIENT 4.5.2 is available
// see https://issues.apache.org/jira/browse/HTTPCLIENT-1704
- //assertEquals(0,c.size()); // Cookies again ignored
- System.out.println("Uncomment assertEquals(0,c.size()) when migrating to httpclient-4.5.2");
+ assertEquals(0,c.size()); // Cookies again ignored
}
@Test
Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Fri Feb 26 22:35:18 2016
@@ -150,10 +150,8 @@ public class TestHTTPSamplersAgainstHttp
}
public void testPostRequest_FormMultipart3() throws Exception {
- // FIXME Requires HTTPCLIENT 4.5.2
// see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
- //testPostRequest_FormMultipart(HTTP_SAMPLER3, US_ASCII);
- System.out.println("Uncomment testPostRequest_FormMultipart3() when migrating to HTTPCLIENT 4.5.2");
+ testPostRequest_FormMultipart(HTTP_SAMPLER3, US_ASCII);
}
public void testPostRequest_FileUpload() throws Exception {
@@ -165,10 +163,8 @@ public class TestHTTPSamplersAgainstHttp
}
public void testPostRequest_FileUpload3() throws Exception {
- // FIXME Requires HTTPCLIENT 4.5.2
// see https://issues.apache.org/jira/browse/HTTPCLIENT-1665
- //testPostRequest_FileUpload(HTTP_SAMPLER3, US_ASCII);
- System.out.println("Uncomment testPostRequest_FileUpload3() when migrating to HTTPCLIENT 4.5.2");
+ testPostRequest_FileUpload(HTTP_SAMPLER3, US_ASCII);
}
public void testPostRequest_BodyFromParameterValues() throws Exception {
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1732569&r1=1732568&r2=1732569&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 26 22:35:18 2016
@@ -157,7 +157,7 @@ Summary
<li><bug>58515</bug>New JSON related components : JSON-PATH Extractor and JSON-PATH Renderer in View Results Tree. Donated by Ubik Load Pack (support at ubikloadpack.com).</li>
<li><bug>58698</bug>Correct parsing of auth-files in HTTP Authorization Manager.</li>
<li><bug>58756</bug>CookieManager : Cookie Policy select box content must depend on Cookie implementation.</li>
- <li><bug>56358</bug>Cookie manager supports cross port cookies and RFC6265.</li>
+ <li><bug>56358</bug>Cookie manager supports cross port cookies and RFC6265. Thanks to Oleg Kalnichevski (olegk at apache.org)</li>
<li><bug>58773</bug>TestCacheManager : Add tests for CacheManager that use HttpClient 4</li>
<li><bug>58742</bug>CompareAssertion : Reset data in TableEditor when switching between different CompareAssertions in gui.
Based on a patch by Vincent Herilier (vherilier at gmail.com)</li>
@@ -193,7 +193,7 @@ Summary
<li><bug>58699</bug>Workbench changes neither saved nor prompted for saving upon close. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58726</bug>Remove the <code>jmeterthread.startearlier</code> parameter. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58728</bug>Drop old behavioural properties</li>
-<li><bug>57319</bug>Upgrade to HttpClient 4.5.X. With the big help from Oleg Kalnichevski.</li>
+<li><bug>57319</bug>Upgrade to HttpClient 4.5.2. With the big help from Oleg Kalnichevski (olegk at apache.org) and Gary Gregory (ggregory at apache.org).</li>
<li><bug>58772</bug>Deprecate MongoDB related elements</li>
<li><bug>58782</bug>ThreadGroup : Improve ergonomy</li>
<li><bug>58165</bug>Show the time elapsed since the start of the load test in GUI mode. Partly based on a contribution from Maxime Chassagneux (maxime.chassagneux at gmail.com)</li>
@@ -219,6 +219,7 @@ Summary
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>
+<li>Updated to httpclient, httpmime 4.5.2 (from 4.2.6)</li>
<li>Updated to tika-core and tika-parsers 1.12 (from 1.7)</li>
<li>Updated to commons-math3 3.5 (from 3.4.1)</li>
<li>Updated to commons-pool2 2.4.2 (from 2.3)</li>
@@ -269,6 +270,8 @@ Summary
<li><bug>59044</bug>Http Sampler : It should not be possible to select the multipart encoding if the method is not POST. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59008</bug>Http Sampler: Infinite recursion SampleResult on frame depth limit reached</li>
<li><bug>59069</bug>CookieManager : Selected Cookie Policy is always reset to default when saving or switching to another TestElement (nightly build 25th feb 2016)</li>
+ <li><bug>58881</bug>HTTP Request : HTTPHC4Impl shows exception when server uses "deflate" compression</li>
+ <li><bug>58583</bug>HTTP client fails to close connection if server misbehaves by not sending "connection: close", violating HTTP RFC 2616 / RFC 7230</li>
</ul>
<h3>Other Samplers</h3>
@@ -355,6 +358,7 @@ Summary
<li>Harrison Termotto (harrison dot termotto at stonybrook.edu</li>
<li>Vincent Herilier (vherilier at gmail.com)</li>
<li>Denis Kirpichenkov (denis.kirpichenkov at gmail.com)</li>
+<li>Gary Gregory (ggregory at apache.org)</li>
</ul>
<br/>