You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/09/23 23:29:30 UTC
svn commit: r1000635 - in /jakarta/jmeter/trunk/src/protocol:
http/org/apache/jmeter/protocol/http/proxy/
http/org/apache/jmeter/protocol/http/sampler/
http/org/apache/jmeter/protocol/http/util/
jms/org/apache/jmeter/protocol/jms/sampler/ mail/org/apac...
Author: sebb
Date: Thu Sep 23 21:29:30 2010
New Revision: 1000635
URL: http://svn.apache.org/viewvc?rev=1000635&view=rev
Log:
Document where default charset is used
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=1000635&r1=1000634&r2=1000635&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Thu Sep 23 21:29:30 2010
@@ -197,7 +197,7 @@ public class Proxy extends Thread {
if ((request.getMethod().startsWith(HTTPConstants.CONNECT)) && (outStreamClient != null)) {
log.debug("Method CONNECT => SSL");
// write a OK reponse to browser, to engage SSL exchange
- outStreamClient.write(("HTTP/1.0 200 OK\r\n\r\n").getBytes()); // $NON-NLS-1$
+ outStreamClient.write(("HTTP/1.0 200 OK\r\n\r\n").getBytes()); // $NON-NLS-1$ // TODO charset?
outStreamClient.flush();
// With ssl request, url is host:port (without https:// or path)
String[] param = request.getUrl().split(":"); // $NON-NLS-1$
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=1000635&r1=1000634&r2=1000635&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Thu Sep 23 21:29:30 2010
@@ -193,6 +193,7 @@ public class HTTPSampleResult extends Sa
if (getDataEncodingNoDefault() == null && getContentType().startsWith("text/html")){ // $NON-NLS-1$
byte[] bytes=getResponseData();
// get the start of the file
+ // TODO - charset?
String prefix = new String(bytes,0,Math.min(bytes.length, 1000)).toLowerCase(java.util.Locale.ENGLISH);
// Extract the content-type if present
final String METATAG = "<meta http-equiv=\"content-type\" content=\""; // $NON-NLS-1$
@@ -201,7 +202,8 @@ public class HTTPSampleResult extends Sa
tagstart += METATAG.length();
int tagend = prefix.indexOf("\"", tagstart); // $NON-NLS-1$
if (tagend!=-1){
- final String ct = new String(bytes,tagstart,tagend-tagstart);
+ // TODO use fixed charset:
+ final String ct = new String(bytes,tagstart,tagend-tagstart); // TODO - charset?
setEncodingAndType(ct);// Update the dataEncoding
}
}
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java?rev=1000635&r1=1000634&r2=1000635&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java (original)
+++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/LoopbackHTTPSocket.java Thu Sep 23 21:29:30 2010
@@ -66,7 +66,7 @@ public class LoopbackHTTPSocket extends
private LoopbackHTTPSocket() throws IOException{
os=new LoopbackOutputStream();
// Preload the output so that can be read back as HTTP
- os.write("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n".getBytes());
+ os.write("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n".getBytes()); // TODO - charset?
}
public LoopbackHTTPSocket(String host, int port, InetAddress localAddress, int localPort, int timeout) throws IOException {
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1000635&r1=1000634&r2=1000635&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Thu Sep 23 21:29:30 2010
@@ -165,9 +165,9 @@ public class SubscriberSampler extends B
result.sampleEnd();
result.setResponseMessage(read + " samples messages received");
if (getReadResponseAsBoolean()) {
- result.setResponseData(buffer.toString().getBytes());
+ result.setResponseData(buffer.toString().getBytes()); // TODO - charset?
} else {
- result.setBytes(buffer.toString().getBytes().length);
+ result.setBytes(buffer.toString().getBytes().length); // TODO - charset?
}
result.setResponseHeaders(propBuffer.toString());
if (read == 0) {
Modified: jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java?rev=1000635&r1=1000634&r2=1000635&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/SmtpSampler.java Thu Sep 23 21:29:30 2010
@@ -282,9 +282,10 @@ public class SmtpSampler extends Abstrac
byte[] buf = new byte[1024];
int read = is.read(buf);
while (read > 0) {
- sb.append(new String(buf, 0, read));
+ sb.append(new String(buf, 0, read)); // TODO - charset?
read = is.read(buf);
}
+ // TODO - charset?
res.setResponseData(sb.toString().getBytes()); // TODO this should really be request data, but there is none
} catch (IOException ex) {
log.warn("",ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org