You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2003/12/01 02:59:58 UTC

cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler HTTPSampler.java

sebb        2003/11/30 17:59:58

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/sampler
                        HTTPSampler.java
  Log:
  Allow for missing Content-type (e.g. with 3xx responses); return header as si
  
  Revision  Changes    Path
  1.69      +8 -7      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.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- HTTPSampler.java	28 Nov 2003 14:40:32 -0000	1.68
  +++ HTTPSampler.java	1 Dec 2003 01:59:58 -0000	1.69
  @@ -877,11 +877,12 @@
           throws IOException
       {
           StringBuffer headerBuf= new StringBuffer();
  -        headerBuf.append(conn.getHeaderField(0).substring(0, 8));
  -        headerBuf.append(" ");
  -        headerBuf.append(conn.getResponseCode());
  -        headerBuf.append(" ");
  -        headerBuf.append(conn.getResponseMessage());
  +		headerBuf.append(conn.getHeaderField(0));//Leave header as is 
  +//        headerBuf.append(conn.getHeaderField(0).substring(0, 8));
  +//        headerBuf.append(" ");
  +//        headerBuf.append(conn.getResponseCode());
  +//        headerBuf.append(" ");
  +//        headerBuf.append(conn.getResponseMessage());
           headerBuf.append("\n");
   
           for (int i= 1; conn.getHeaderFieldKey(i) != null; i++)
  @@ -1079,7 +1080,7 @@
   
               String ct= conn.getHeaderField("Content-type");
               res.setContentType(ct);
  -            if (ct.startsWith("image/"))
  +            if (ct != null && ct.startsWith("image/"))
               {
                   res.setDataType(HTTPSampleResult.BINARY);
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org