From c9c7ef67b22aee0f039486263a8c9f68f8124245 Mon Sep 17 00:00:00 2001
From: Sebastian Bazley <sebb@apache.org>
Date: Mon, 9 Jul 2012 16:46:38 +0000
Subject: [PATCH] Update to HttpClient 4.2.1

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1359272 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 458b18288096bed603c0097331438cc33c74c40a
---
 build.properties  | 6 +++---
 eclipse.classpath | 4 ++--
 xdocs/changes.xml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index cbf7127073..9ae7ebf248 100644
--- a/build.properties
+++ b/build.properties
@@ -150,16 +150,16 @@ htmlparser.jar              = htmlparser-${htmlparser.version}.jar
 htmlparser.md5              = aa05b921026c228f92ef8b4a13c26f8d
 
 # Apache HttpClient 4.x
-httpclient.version          = 4.2
+httpclient.version          = 4.2.1
 #
 httpclient.jar              = httpclient-${httpclient.version}.jar
 httpclient.loc              = ${maven2.repo}/org/apache/httpcomponents/httpclient/${httpclient.version}
-httpclient.md5              = c16abd2428d2abf95e0af53aaa775f1b
+httpclient.md5              = 54b09b6e45ff3e2adf0409aa6e652a8d
 
 # Required for HttpClient
 httpmime.jar               = httpmime-${httpclient.version}.jar
 httpmime.loc               = ${maven2.repo}/org/apache/httpcomponents/httpmime/${httpclient.version}
-httpmime.md5               = b1008eeefe9b4744effe21b77f3e2469
+httpmime.md5               = debbb029073ed28c3a69530cb8e14ef5
 
 # Required for HttpClient
 httpcore.version            = 4.2.1
diff --git a/eclipse.classpath b/eclipse.classpath
index 6ad60df597..57c1e0c5c7 100644
--- a/eclipse.classpath
+++ b/eclipse.classpath
@@ -62,9 +62,9 @@
     <classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
-    <classpathentry kind="lib" path="lib/httpclient-4.2.jar"/>
+    <classpathentry kind="lib" path="lib/httpclient-4.2.1.jar"/>
     <classpathentry kind="lib" path="lib/httpcore-4.2.1.jar"/>
-    <classpathentry kind="lib" path="lib/httpmime-4.2.jar"/>
+    <classpathentry kind="lib" path="lib/httpmime-4.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/jdom-1.1.2.jar"/>
 	<classpathentry kind="lib" path="lib/rhino-1.7R3.jar"/>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 3c2769ed0a..cb6f6111dd 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -153,7 +153,7 @@ JSR223 Test Elements using Script file are now Compiled if ScriptEngine supports
 <ul>
 <li><bugzilla>53311</bugzilla> - JMeterUtils#runSafe should not throw Error when interrupted</li>
 <li>Updated to commons-net-3.1 (from 3.0.1)</li>
-<li>Updated to HttpComponents Core 4.2.1 (from 4.1.4) and HttpComponents Client 4.2 (from 4.1.3)</li>
+<li>Updated to HttpComponents Core 4.2.1 (from 4.1.4) and HttpComponents Client 4.2.1 (from 4.1.3)</li>
 </ul>
 
 </section>