Author: sebb Date: Tue Jan 19 01:18:11 2010 New Revision: 900635 URL: http://svn.apache.org/viewvc?rev=900635&view=rev Log: Bug 48568 - CookieManager broken for AjpSampler
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=900635&r1=900634&r2=900635&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Tue Jan 19 01:18:11 2010 @@ -27,6 +27,7 @@ import java.net.URL; import org.apache.jmeter.protocol.http.control.AuthManager; +import org.apache.jmeter.protocol.http.control.Cookie; import org.apache.jmeter.protocol.http.control.CookieManager; import org.apache.jmeter.protocol.http.control.Header; import org.apache.jmeter.protocol.http.control.HeaderManager; @@ -179,7 +180,7 @@ setInt(getHeaderSize(method, url)); String hdr = setConnectionHeaders(url, host, method); res.setRequestHeaders(hdr); - setConnectionCookies(url, getCookieManager()); + res.setCookies(setConnectionCookies(url, getCookieManager())); setByte((byte)0xff); // Attributes not supported } @@ -304,16 +305,19 @@ return newValue.toString(); } - private void setConnectionCookies(URL url, CookieManager cookies) { + private String setConnectionCookies(URL url, CookieManager cookies) { + String cookieHeader = null; if(cookies != null) { + cookieHeader = cookies.getCookieHeaderForURL(url); CollectionProperty coll = cookies.getCookies(); PropertyIterator i = coll.iterator(); while(i.hasNext()) { - JMeterProperty header = i.next(); + Cookie cookie = (Cookie)(i.next().getObjectValue()); setInt(0xA009); // Cookie - setString(header.getName()+"="+header.getStringValue());//$NON-NLS-1$ + setString(cookie.getName()+"="+cookie.getValue());//$NON-NLS-1$ } } + return cookieHeader; } private int translateHeader(String n) { @@ -484,4 +488,4 @@ inpos+= len+1; return s; } -} \ No newline at end of file +} Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=900635&r1=900634&r2=900635&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Jan 19 01:18:11 2010 @@ -75,6 +75,7 @@ <li>Bug 47442 - Missing replacement of https by http for certain conditions using https-spoofing</li> <li>Bug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the else branch</li> <li>Bug 48542 - SoapSampler uses wrong response header field to decide if response is gzip encoded</li> +<li>Bug 48568 - CookieManager broken for AjpSampler</li> </ul> <h3>Other Samplers</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org