Skip to content

Commit 0d6c5b5

Browse files
pmouawadpmouawad
committed
Bug 62852 - HTTP Request Header missing information when using a proxy
Upgrade to httpclient 4.5.7 and revert workaround Bugzilla Id: 62852 git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1852155 13f79535-47bb-0310-9956-ffa450edef68 Former-commit-id: cb4c09b
1 parent d85fa67 commit 0d6c5b5

7 files changed

Lines changed: 20 additions & 30 deletions

File tree

‎LICENSE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ The following software is provided under the Apache License V 2.0 (as above):
226226
* dec-0.1.2.jar
227227
* groovy-all-2.4.16.jar
228228
* httpasyncclient-4.1.4.jar
229-
* httpclient-4.5.6.jar
230-
* httpcore-4.4.10.jar
229+
* httpclient-4.5.7.jar
230+
* httpcore-4.4.11.jar
231231
* httpcore-nio-4.4.10.jar
232-
* httpmime-4.5.6.jar
232+
* httpmime-4.5.7.jar
233233
* jakarta-oro-2.0.8.jar
234234
* jms-1.1.1.jar
235235
* log4j-1.2-api-2.11.1.jar

‎build.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,22 +187,22 @@ httpasyncclient.loc = ${maven2.repo}/org/apache/httpcomponents/http
187187
httpasyncclient.sha512 = 0A80DB5DBF772F02D02BA6C7C163E8DA9517DD7195714B495ACB845C429580C1FC926D3E71C115E75BE8C145651DCE2FDFA0DC380132F7809C14B3AD95492AEE
188188

189189
# Apache HttpClient 4.x
190-
httpclient.version = 4.5.6
190+
httpclient.version = 4.5.7
191191
httpclient.jar = httpclient-${httpclient.version}.jar
192192
httpclient.loc = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
193-
httpclient.sha512 = 32CB1EE6E34C883FF7F4ADE7EAF563152962B0E40E6795F93D1600FFE1CED7102062C8D0C2C31F4FC9606F1F500EA554E5D83B7AE650C1D78A3BE312808E6F35
193+
httpclient.sha512 = 459349C2482338644578502CBDFEB7110C3EAAA71F8BBC715D53556B186F16AD1256244E752CEC7C32C66F77E08228BDADF7C9138542B0AA8E845A249E2E0BAC
194194

195195
# Required for HttpClient
196-
httpmime.version = 4.5.6
196+
httpmime.version = 4.5.7
197197
httpmime.jar = httpmime-${httpmime.version}.jar
198198
httpmime.loc = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpmime.version}
199-
httpmime.sha512 = 9841DB7779B647DE4668DED9B79E8C510A653076384FC3059EF186EA5D82828E149DE48C016B5CB89A1BEABE60981429265A8324BE3108473C57AF77A62ABD6A
199+
httpmime.sha512 = 49AF147F87F4982921EB1A0C5AC7B4D3B61F8EC2D8F0064EBC776D9226E400558A91FE63944CE7C85B08EDAB1271B08FBB217284A4E839D5FF80C67E4478E9EC
200200

201201
# Required for HttpClient
202-
httpcore.version = 4.4.10
202+
httpcore.version = 4.4.11
203203
httpcore.jar = httpcore-${httpcore.version}.jar
204204
httpcore.loc = ${maven2.repo}/org/apache/httpcomponents/httpcore/${httpcore.version}
205-
httpcore.sha512 = 7F58003E9EEC977627401C4C6BC720AF257094F492B0F73C43FB547E0D161017657F5C9C0B834704C5C00112B91E88EE9E4C255CC1E31AA62BA979D21393AED4
205+
httpcore.sha512 = 1F45A26F97E5488BF1985F5F5C88C5E2744F46D422040708F7641DEB14BB04561BCEC35C9284C1DCE606FCDCB768EDC3EF970EF965BD6BB591EC362DFD417C74
206206

207207
# Required for HttpASyncClient
208208
httpcore-nio.version = 4.4.10

‎eclipse.classpath‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
<classpathentry kind="lib" path="lib/hamcrest-date-2.0.4.jar"/>
7171
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
7272
<classpathentry kind="lib" path="lib/httpasyncclient-4.1.4.jar"/>
73-
<classpathentry kind="lib" path="lib/httpclient-4.5.6.jar"/>
73+
<classpathentry kind="lib" path="lib/httpclient-4.5.7.jar"/>
7474
<classpathentry kind="lib" path="lib/httpcore-nio-4.4.10.jar"/>
75-
<classpathentry kind="lib" path="lib/httpcore-4.4.10.jar"/>
76-
<classpathentry kind="lib" path="lib/httpmime-4.5.6.jar"/>
75+
<classpathentry kind="lib" path="lib/httpcore-4.4.11.jar"/>
76+
<classpathentry kind="lib" path="lib/httpmime-4.5.7.jar"/>
7777
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.8.jar"/>
7878
<classpathentry kind="lib" path="lib/jackson-core-2.9.8.jar"/>
7979
<classpathentry kind="lib" path="lib/jackson-databind-2.9.8.jar"/>

‎lib/aareadme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ junit 4.12
214214

215215
HttpComponents
216216
- HttpComponents Core 4.4.10
217-
- HttpComponents Client 4.5.6
217+
- HttpComponents Client 4.5.7
218218
- HttpComponents AsyncClient 4.1.4
219219
- HttpComponents Core NIO 4.4.10
220220
-----------

‎res/maven/ApacheJMeter_parent.pom‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ under the License.
7878
<hamcrest-core.version>1.3</hamcrest-core.version>
7979
<hamcrest-date.version>2.0.4</hamcrest-date.version>
8080
<httpasyncclient.version>4.1.4</httpasyncclient.version>
81-
<httpclient.version>4.5.6</httpclient.version>
82-
<httpcore.version>4.4.10</httpcore.version>
81+
<httpclient.version>4.5.7</httpclient.version>
82+
<httpcore.version>4.4.11</httpcore.version>
8383
<httpcore-nio.version>4.4.10</httpcore-nio.version>
84-
<httpmime.version>4.5.6</httpmime.version>
84+
<httpmime.version>4.5.7</httpmime.version>
8585
<jackson-annotations.version>2.9.8</jackson-annotations.version>
8686
<jackson-core.version>2.9.8</jackson-core.version>
8787
<jackson-databind.version>2.9.8</jackson-databind.version>

‎src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -382,19 +382,6 @@ public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
382382

383383
// see https://stackoverflow.com/questions/26166469/measure-bandwidth-usage-with-apache-httpcomponents-httpclient
384384
private static final HttpRequestExecutor REQUEST_EXECUTOR = new HttpRequestExecutor() {
385-
386-
@Override
387-
public void preProcess(HttpRequest request, org.apache.http.protocol.HttpProcessor processor, HttpContext context) throws HttpException ,IOException {
388-
Object savedRequest = context.getAttribute(HttpCoreContext.HTTP_REQUEST);
389-
super.preProcess(request, processor, context);
390-
// Temporary fix to https://issues.apache.org/jira/browse/HTTPCLIENT-1956
391-
// TODO Remove it when httpclient-4.5.7 is released
392-
if (HTTPConstants.CONNECT.equals(request.getRequestLine().getMethod())) {
393-
log.debug("Swap in original http request: {} for {}", savedRequest, request);
394-
context.setAttribute(HttpCoreContext.HTTP_REQUEST, savedRequest);
395-
}
396-
}
397-
398385
@Override
399386
protected HttpResponse doSendRequest(
400387
final HttpRequest request,

‎xdocs/changes.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ See <bugzilla>63094</bugzilla>
158158
<li><bug>62893</bug>Use StringEscapeUtils from commons-text (version 1.6) instead of the deprecated ones from commons-lang3.</li>
159159
<li><bug>62972</bug><pr>435</pr>Replace calls to deprecated method <code>Class#newInstance</code>.</li>
160160
<li><bug>63034</bug>ClientJMeterEngine: Make rsetProperties use <code>HashMap&lt;String,String&gt;</code> instead of Properties</li>
161+
<li>Updated to httpclient/httpmime 4.5.7 (from 4.5.6)</li>
162+
<li>Updated to httpcore 4.4.11 (from 4.4.10)</li>
161163
<li>Updated to tika-core and tika-parsers 1.20 (from 1.18)</li>
162164
<li>Updated to commons-dbcp2-2.5.0 (from commons-dbcp2-2.4.0)</li>
163165
<li>Updated to commons-lang3-3.8.1 (from commons-lang3-3.8)</li>
@@ -194,7 +196,7 @@ See <bugzilla>63094</bugzilla>
194196
<li><bug>62916</bug>HTTP Test Script Recorder fails with UnsupportedOperationException if recording is started after a distributed test has been run</li>
195197
<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>
196198
<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>
197-
<li><bug>62852</bug>HTTP Request Header missing information when using a proxy</li>
199+
<li><bug>62852</bug>HTTP Request Header missing information when using a proxy. Thanks to Oleg Kalnichevski (olegk at apache.org)</li>
198200
<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>
199201
</ul>
200202

@@ -267,6 +269,7 @@ See <bugzilla>63094</bugzilla>
267269
<p>We thank all contributors mentioned in bug and improvement sections above:
268270
</p>
269271
<ul>
272+
<li>Oleg Kalnichevski (olegk at apache.org)</li>
270273
<li>Till Neunast (https://github.com/tilln)</li>
271274
<li>Mingun (alexander_sergey at mail.ru)</li>
272275
<li><a href="https://ubikloadpack.com">Ubik Load Pack</a></li>

0 commit comments

Comments
 (0)