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/11/18 19:26:55 UTC

cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy Proxy.java

sebb        2003/11/18 10:26:55

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/proxy
                        Proxy.java
  Log:
  Always pass browser headers to server, even if not stroing headers in the test plan
  
  Revision  Changes    Path
  1.14      +18 -15    jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
  
  Index: Proxy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Proxy.java	20 Oct 2003 11:00:11 -0000	1.13
  +++ Proxy.java	18 Nov 2003 18:26:55 -0000	1.14
  @@ -144,21 +144,22 @@
                       new BufferedInputStream(clientSocket.getInputStream()));
   
               sampler = request.getSampler();
  -            if (captureHttpHeaders)
  -            {
  -                headers = request.getHeaderManager();
  -                sampler.setHeaderManager(headers);
  -            }
  +            
  +            /*
  +             * Create a Header Manager to ensure that the browsers headers
  +             * are captured and sent to the server
  +            */
  +            headers = request.getHeaderManager();
  +            sampler.setHeaderManager(headers);
   
               serverResponse = sampler.sample().getResponseData();
               writeToClient(
                   serverResponse,
                   new BufferedOutputStream(clientSocket.getOutputStream()));
  -            if (captureHttpHeaders)
  -            {
  -            	headers.removeHeaderNamed("cookie");
  -            }
  -           
  +            /*
  +             * We don't want to store any cookies in the generated test plan
  +             */
  +          	headers.removeHeaderNamed("cookie");// Always remove cookies
           }
           catch (UnknownHostException uhe)
           {
  @@ -173,9 +174,11 @@
           finally
           {
               target.deliverSampler(
  -                                       sampler,
  -                                       new TestElement[] { headers },
  -                                       serverResponse);
  +                                  sampler,
  +                                  new TestElement[] { 
  +                                  	captureHttpHeaders ? headers : null 
  +                                  	},
  +                                  serverResponse);
               try
               {
                   clientSocket.close();
  @@ -203,7 +206,7 @@
           {
               out.write(inBytes);
               out.flush();
  -            log.info("Done writing to client");
  +            log.debug("Done writing to client");
           }
           catch (IOException e)
           {
  
  
  

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