Author: milamber
Date: Wed Sep 14 22:03:12 2011
New Revision: 1170866
URL: http://svn.apache.org/viewvc?rev=1170866&view=rev
Log:
Bug 51775 - Port number duplicates in Host header when capturing by HttpClient
(3.1 and 4.x)
Simplify and improve last fix. Thanks sebb.
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1170866&r1=1170865&r2=1170866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Wed Sep 14 22:03:12 2011
@@ -592,7 +592,7 @@ public class HTTPHC3Impl extends HTTPHCA
if (! HEADER_CONTENT_LENGTH.equalsIgnoreCase(n)){
String v = header.getValue();
if (HEADER_HOST.equalsIgnoreCase(n)) {
- v = removePortInHostHeader(v, u.getPort());
+ v = v.replaceFirst(":\\d+$",""); // remove any
port specification // $NON-NLS-1$ $NON-NLS-2$
method.getParams().setVirtualHost(v);
} else {
method.addRequestHeader(n, v);
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1170866&r1=1170865&r2=1170866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Wed Sep 14 22:03:12 2011
@@ -639,7 +639,7 @@ public class HTTPHC4Impl extends HTTPHCA
String v = header.getValue();
if (HEADER_HOST.equalsIgnoreCase(n)) {
int port = url.getPort();
- v = removePortInHostHeader(v, port);
+ v = v.replaceFirst(":\\d+$",""); // remove any
port specification // $NON-NLS-1$ $NON-NLS-2$
if (port != -1) {
if (port == url.getDefaultPort()) {
port = -1; // no need to specify the port
if it is the default
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java?rev=1170866&r1=1170865&r2=1170866&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHCAbstractImpl.java
Wed Sep 14 22:03:12 2011
@@ -152,19 +152,4 @@ public abstract class HTTPHCAbstractImpl
protected static boolean isStaticProxy(String host){
return PROXY_DEFINED && !isNonProxy(host);
}
-
- /**
- * In proxy record mode, remove port to host header value
- *
- * @param hostHeader
- * @param port to remove
- * @return host value without ":port"
- */
- protected static String removePortInHostHeader(String hostHeader, int
port) {
- String rePort = ":" + String.valueOf(port); // $NON-NLS-1$
- if (hostHeader.trim().endsWith(rePort)) {
- return hostHeader.replaceFirst(rePort + "$", ""); // $NON-NLS-1$
$NON-NLS-2$
- }
- return hostHeader;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
