sebb 2003/11/19 16:17:46
Modified: src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
Handle images as binary data
Revision Changes Path
1.57 +12 -5
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- HTTPSampler.java 18 Nov 2003 17:49:04 -0000 1.56
+++ HTTPSampler.java 20 Nov 2003 00:17:46 -0000 1.57
@@ -1204,10 +1204,17 @@
byte[] ret = readResponse(conn);
byte[] head = getResponseHeaders(conn, res);
time = System.currentTimeMillis() - time;
- byte[] complete = new byte[ret.length + head.length];
- System.arraycopy(head, 0, complete, 0, head.length);
- System.arraycopy(ret, 0, complete, head.length, ret.length);
- res.setResponseData(complete);
+ String ct = conn.getHeaderField("Content-type");
+ res.setContentType(ct);
+ if (ct.startsWith("image/")){
+ res.setDataType(SampleResult.BINARY);
+ res.setResponseData(ret);
+ } else {
+ byte[] complete = new byte[ret.length + head.length];
+ System.arraycopy(head, 0, complete, 0, head.length);
+ System.arraycopy(ret, 0, complete, head.length, ret.length);
+ res.setResponseData(complete);
+ }
res.setSuccessful(true);
return time;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
