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 2007/09/01 14:40:36 UTC
svn commit: r571789 - in /jakarta/jmeter/branches/rel-2-2:
bin/jmeter.properties
src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
xdocs/changes.xml
Author: sebb
Date: Sat Sep 1 05:40:35 2007
New Revision: 571789
URL: http://svn.apache.org/viewvc?rev=571789&view=rev
Log:
Bug 28715 - allow variables in Cookie Manager
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties?rev=571789&r1=571788&r2=571789&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Sat Sep 1 05:40:35 2007
@@ -532,6 +532,10 @@
# Default is true. Use false to revert to original behaviour
#CookieManager.delete_null_cookies=true
+# CookieManager behaviour - should variable cookies be allowed?
+# Default is true. Use false to revert to original behaviour
+#CookieManager.allow_variable_cookies=true
+
# (2.0.3) JMeterThread behaviour has been changed to set the started flag before
# the controllers are initialised. This is so controllers can access variables earlier.
# In case this causes problems, the previous behaviour can be restored by uncommenting
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java?rev=571789&r1=571788&r2=571789&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java Sat Sep 1 05:40:35 2007
@@ -69,6 +69,10 @@
private static final boolean DELETE_NULL_COOKIES
= JMeterUtils.getPropDefault("CookieManager.delete_null_cookies", true);// $NON-NLS-1$
+ // See bug 28715
+ private static final boolean ALLOW_VARIABLE_COOKIES
+ = JMeterUtils.getPropDefault("CookieManager.allow_variable_cookies", true);// $NON-NLS-1$
+
private transient CookieSpec cookieSpec;
public static final String DEFAULT_POLICY = CookiePolicy.BROWSER_COMPATIBILITY;
@@ -288,7 +292,10 @@
int i=0;
for (PropertyIterator iter = getCookies().iterator(); iter.hasNext();) {
Cookie jmcookie = (Cookie) iter.next().getObjectValue();
+ // Set to running version, to allow function evaluation for the cookie values (bug 28715)
+ if (ALLOW_VARIABLE_COOKIES) jmcookie.setRunningVersion(true);
cookies[i++] = makeCookie(jmcookie);
+ if (ALLOW_VARIABLE_COOKIES) jmcookie.setRunningVersion(false);
}
String host = url.getHost();
String protocol = url.getProtocol();
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=571789&r1=571788&r2=571789&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Sep 1 05:40:35 2007
@@ -48,6 +48,7 @@
<li>Bug 42947 - TestBeanGUI changes not picked up when short-cut keys used</li>
<li>Added serializer.jar (needed for update to xalan 2.7.0)</li>
<li>Bug 38687 - Module controller does not work in non-GUI mode</li>
+<li>Bug 28715 - allow variable cookie values (set CookieManager.allow_variable_cookies=false to disable)</li>
</ul>
<h4>Improvements since 2.3RC3</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org