Author: pmouawad
Date: Fri Jan 25 17:40:24 2019
New Revision: 1852155
URL: http://svn.apache.org/viewvc?rev=1852155&view=rev
Log:
Bug 62852 - HTTP Request Header missing information when using a proxy
Upgrade to httpclient 4.5.7 and revert workaround
Bugzilla Id: 62852
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Fri Jan 25 17:40:24 2019
@@ -226,10 +226,10 @@ The following software is provided under
* dec-0.1.2.jar
* groovy-all-2.4.16.jar
* httpasyncclient-4.1.4.jar
-* httpclient-4.5.6.jar
-* httpcore-4.4.10.jar
+* httpclient-4.5.7.jar
+* httpcore-4.4.11.jar
* httpcore-nio-4.4.10.jar
-* httpmime-4.5.6.jar
+* httpmime-4.5.7.jar
* jakarta-oro-2.0.8.jar
* jms-1.1.1.jar
* log4j-1.2-api-2.11.1.jar
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Jan 25 17:40:24 2019
@@ -187,22 +187,22 @@ httpasyncclient.loc = ${mav
httpasyncclient.sha512 =
0A80DB5DBF772F02D02BA6C7C163E8DA9517DD7195714B495ACB845C429580C1FC926D3E71C115E75BE8C145651DCE2FDFA0DC380132F7809C14B3AD95492AEE
# Apache HttpClient 4.x
-httpclient.version = 4.5.6
+httpclient.version = 4.5.7
httpclient.jar = httpclient-${httpclient.version}.jar
httpclient.loc =
${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.sha512 =
32CB1EE6E34C883FF7F4ADE7EAF563152962B0E40E6795F93D1600FFE1CED7102062C8D0C2C31F4FC9606F1F500EA554E5D83B7AE650C1D78A3BE312808E6F35
+httpclient.sha512 =
459349C2482338644578502CBDFEB7110C3EAAA71F8BBC715D53556B186F16AD1256244E752CEC7C32C66F77E08228BDADF7C9138542B0AA8E845A249E2E0BAC
# Required for HttpClient
-httpmime.version = 4.5.6
+httpmime.version = 4.5.7
httpmime.jar = httpmime-${httpmime.version}.jar
httpmime.loc =
${maven2.repo}/org/apache/httpcomponents/httpmime/${httpmime.version}
-httpmime.sha512 =
9841DB7779B647DE4668DED9B79E8C510A653076384FC3059EF186EA5D82828E149DE48C016B5CB89A1BEABE60981429265A8324BE3108473C57AF77A62ABD6A
+httpmime.sha512 =
49AF147F87F4982921EB1A0C5AC7B4D3B61F8EC2D8F0064EBC776D9226E400558A91FE63944CE7C85B08EDAB1271B08FBB217284A4E839D5FF80C67E4478E9EC
# Required for HttpClient
-httpcore.version = 4.4.10
+httpcore.version = 4.4.11
httpcore.jar = httpcore-${httpcore.version}.jar
httpcore.loc =
${maven2.repo}/org/apache/httpcomponents/httpcore/${httpcore.version}
-httpcore.sha512 =
7F58003E9EEC977627401C4C6BC720AF257094F492B0F73C43FB547E0D161017657F5C9C0B834704C5C00112B91E88EE9E4C255CC1E31AA62BA979D21393AED4
+httpcore.sha512 =
1F45A26F97E5488BF1985F5F5C88C5E2744F46D422040708F7641DEB14BB04561BCEC35C9284C1DCE606FCDCB768EDC3EF970EF965BD6BB591EC362DFD417C74
# Required for HttpASyncClient
httpcore-nio.version = 4.4.10
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Jan 25 17:40:24 2019
@@ -70,10 +70,10 @@
<classpathentry kind="lib" path="lib/hamcrest-date-2.0.4.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/httpasyncclient-4.1.4.jar"/>
- <classpathentry kind="lib" path="lib/httpclient-4.5.6.jar"/>
+ <classpathentry kind="lib" path="lib/httpclient-4.5.7.jar"/>
<classpathentry kind="lib" path="lib/httpcore-nio-4.4.10.jar"/>
- <classpathentry kind="lib" path="lib/httpcore-4.4.10.jar"/>
- <classpathentry kind="lib" path="lib/httpmime-4.5.6.jar"/>
+ <classpathentry kind="lib" path="lib/httpcore-4.4.11.jar"/>
+ <classpathentry kind="lib" path="lib/httpmime-4.5.7.jar"/>
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.8.jar"/>
<classpathentry kind="lib" path="lib/jackson-core-2.9.8.jar"/>
<classpathentry kind="lib" path="lib/jackson-databind-2.9.8.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 25 17:40:24 2019
@@ -29,10 +29,10 @@ geronimo*.jar
groovy-all-2.4.16.jar
hamcrest-date-2.0.4.jar
httpasyncclient-4.1.4.jar
-httpclient-4.5.6.jar
-httpcore-4.4.10.jar
+httpclient-4.5.7.jar
+httpcore-4.4.11.jar
httpcore-nio-4.4.10.jar
-httpmime-4.5.6.jar
+httpmime-4.5.7.jar
jackson-annotations-2.9.8.jar
jackson-core-2.9.8.jar
jackson-databind-2.9.8.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Jan 25 17:40:24 2019
@@ -214,7 +214,7 @@ junit 4.12
HttpComponents
- HttpComponents Core 4.4.10
-- HttpComponents Client 4.5.6
+- HttpComponents Client 4.5.7
- HttpComponents AsyncClient 4.1.4
- HttpComponents Core NIO 4.4.10
-----------
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Jan 25 17:40:24 2019
@@ -78,10 +78,10 @@ under the License.
<hamcrest-core.version>1.3</hamcrest-core.version>
<hamcrest-date.version>2.0.4</hamcrest-date.version>
<httpasyncclient.version>4.1.4</httpasyncclient.version>
- <httpclient.version>4.5.6</httpclient.version>
- <httpcore.version>4.4.10</httpcore.version>
+ <httpclient.version>4.5.7</httpclient.version>
+ <httpcore.version>4.4.11</httpcore.version>
<httpcore-nio.version>4.4.10</httpcore-nio.version>
- <httpmime.version>4.5.6</httpmime.version>
+ <httpmime.version>4.5.7</httpmime.version>
<jackson-annotations.version>2.9.8</jackson-annotations.version>
<jackson-core.version>2.9.8</jackson-core.version>
<jackson-databind.version>2.9.8</jackson-databind.version>
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Fri Jan 25 17:40:24 2019
@@ -382,19 +382,6 @@ public class HTTPHC4Impl extends HTTPHCA
// see
https://stackoverflow.com/questions/26166469/measure-bandwidth-usage-with-apache-httpcomponents-httpclient
private static final HttpRequestExecutor REQUEST_EXECUTOR = new
HttpRequestExecutor() {
-
- @Override
- public void preProcess(HttpRequest request,
org.apache.http.protocol.HttpProcessor processor, HttpContext context) throws
HttpException ,IOException {
- Object savedRequest =
context.getAttribute(HttpCoreContext.HTTP_REQUEST);
- super.preProcess(request, processor, context);
- // Temporary fix to
https://issues.apache.org/jira/browse/HTTPCLIENT-1956
- // TODO Remove it when httpclient-4.5.7 is released
- if
(HTTPConstants.CONNECT.equals(request.getRequestLine().getMethod())) {
- log.debug("Swap in original http request: {} for {}",
savedRequest, request);
- context.setAttribute(HttpCoreContext.HTTP_REQUEST,
savedRequest);
- }
- }
-
@Override
protected HttpResponse doSendRequest(
final HttpRequest request,
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1852155&r1=1852154&r2=1852155&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Jan 25 17:40:24 2019
@@ -158,6 +158,8 @@ See <bugzilla>63094</bugzilla>
<li><bug>62893</bug>Use StringEscapeUtils from commons-text (version 1.6)
instead of the deprecated ones from commons-lang3.</li>
<li><bug>62972</bug><pr>435</pr>Replace calls to deprecated method
<code>Class#newInstance</code>.</li>
<li><bug>63034</bug>ClientJMeterEngine: Make rsetProperties use
<code>HashMap<String,String></code> instead of Properties</li>
+ <li>Updated to httpclient/httpmime 4.5.7 (from 4.5.6)</li>
+ <li>Updated to httpcore 4.4.11 (from 4.4.10)</li>
<li>Updated to tika-core and tika-parsers 1.20 (from 1.18)</li>
<li>Updated to commons-dbcp2-2.5.0 (from commons-dbcp2-2.4.0)</li>
<li>Updated to commons-lang3-3.8.1 (from commons-lang3-3.8)</li>
@@ -194,7 +196,7 @@ See <bugzilla>63094</bugzilla>
<li><bug>62916</bug>HTTP Test Script Recorder fails with
UnsupportedOperationException if recording is started after a distributed test
has been run</li>
<li><bug>62987</bug>A TestBean element under HTTP(S) Test Script recorder
does not work. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
<li><bug>63015</bug>Abnormal NoHttpResponseException when running request
through proxy HTTP(S) Test Script Recorder after a first failing request.
Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
- <li><bug>62852</bug>HTTP Request Header missing information when using a
proxy</li>
+ <li><bug>62852</bug>HTTP Request Header missing information when using a
proxy. Thanks to Oleg Kalnichevski (olegk at apache.org)</li>
<li><bug>63048</bug>JMeter does not retrieve link resources of type
"shortcut icon" or "icon". Contributed by Ubik Load Pack (support at
ubikloadpack.com)</li>
</ul>
@@ -267,6 +269,7 @@ See <bugzilla>63094</bugzilla>
<p>We thank all contributors mentioned in bug and improvement sections above:
</p>
<ul>
+ <li>Oleg Kalnichevski (olegk at apache.org)</li>
<li>Till Neunast (https://github.com/tilln)</li>
<li>Mingun (alexander_sergey at mail.ru)</li>
<li><a href="https://ubikloadpack.com";>Ubik Load Pack</a></li>
