From commits-return-7736-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Jul 29 14:15:36 2017 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A28701AC6C for ; Sat, 29 Jul 2017 14:15:36 +0000 (UTC) Received: (qmail 42999 invoked by uid 500); 29 Jul 2017 14:15:36 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 42967 invoked by uid 500); 29 Jul 2017 14:15:36 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 42958 invoked by uid 99); 29 Jul 2017 14:15:36 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Jul 2017 14:15:36 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 7B9B73A004B for ; Sat, 29 Jul 2017 14:15:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1803373 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Date: Sat, 29 Jul 2017 14:15:34 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170729141534.7B9B73A004B@svn01-us-west.apache.org> 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();