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 2017/07/29 14:15:34 UTC
svn commit: r1803373 -
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Author: pmouawad
Date: Sat Jul 29 14:15:34 2017
New Revision: 1803373
URL: http://svn.apache.org/viewvc?rev=1803373&view=rev
Log:
Remove bad character
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1803373&r1=1803372&r2=1803373&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Sat Jul 29 14:15:34 2017
@@ -175,18 +175,18 @@ public class Proxy extends Thread {
byte[] ba = request.parse(new BufferedInputStream(clientSocket.getInputStream()));
if (ba.length == 0) {
if (isDebug) {
- log.debug("{}Â Empty request, ignored", port);
+ log.debug("{} Empty request, ignored", port);
}
throw new JMeterException(); // hack to skip processing
}
if (isDebug) {
- log.debug("{}Â Initial request: {}", port, new String(ba));
+ log.debug("{} Initial request: {}", port, new String(ba));
}
outStreamClient = clientSocket.getOutputStream();
if ((request.getMethod().startsWith(HTTPConstants.CONNECT)) && (outStreamClient != null)) {
if (isDebug) {
- log.debug("{}Â Method CONNECT => SSL", port);
+ log.debug("{} Method CONNECT => SSL", port);
}
// write a OK response to browser, to engage SSL exchange
outStreamClient.write(("HTTP/1.0 200 OK\r\n\r\n").getBytes(SampleResult.DEFAULT_HTTP_ENCODING)); // $NON-NLS-1$
@@ -195,7 +195,7 @@ public class Proxy extends Thread {
String[] param = request.getUrl().split(":"); // $NON-NLS-1$
if (param.length == 2) {
if (isDebug) {
- log.debug("{}Â Start to negotiate SSL connection, host: {}", port ,param[0]);
+ log.debug("{} Start to negotiate SSL connection, host: {}", port ,param[0]);
}
clientSocket = startSSL(clientSocket, param[0]);
} else {
@@ -209,17 +209,17 @@ public class Proxy extends Thread {
} catch (IOException ioe) { // most likely this is because of a certificate error
// param.length is 2 here
final String url = " for '"+ param[0] +"'";
- log.warn("{}Â Problem with SSL certificate for url {}? Ensure browser is set to accept the JMeter proxy cert: {}",
+ log.warn("{} Problem with SSL certificate for url {}? Ensure browser is set to accept the JMeter proxy cert: {}",
port, url,ioe.getMessage());
// won't work: writeErrorToClient(HttpReplyHdr.formInternalError());
result = generateErrorResult(result, request, ioe, "\n**ensure browser is set to accept the JMeter proxy certificate**"); // Generate result (if nec.) and populate it
throw new JMeterException(); // hack to skip processing
}
if (isDebug) {
- log.debug("{}Â Reparse: ", port, new String(ba));
+ log.debug("{} Reparse: ", port, new String(ba));
}
if (ba.length == 0) {
- log.warn("{}Â Empty response to http over SSL. Probably waiting for user to authorize the certificate for {}",
+ log.warn("{} Empty response to http over SSL. Probably waiting for user to authorize the certificate for {}",
port, request.getUrl());
throw new JMeterException(); // hack to skip processing
}
@@ -237,7 +237,7 @@ public class Proxy extends Thread {
sampler.threadStarted(); // Needed for HTTPSampler2
if (isDebug) {
- log.debug("{}Â Execute sample: {} and url {}",port, sampler.getMethod(), sampler.getUrl());
+ log.debug("{} Execute sample: {} and url {}",port, sampler.getMethod(), sampler.getUrl());
}
result = sampler.sample();