Index: java/org/apache/commons/httpclient/HttpMethodBase.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v retrieving revision 1.212 diff -u -r1.212 HttpMethodBase.java --- java/org/apache/commons/httpclient/HttpMethodBase.java 14 Sep 2004 20:11:31 -0000 1.212 +++ java/org/apache/commons/httpclient/HttpMethodBase.java 15 Sep 2004 12:38:48 -0000 @@ -1122,11 +1122,18 @@ /** * Returns the actual cookie policy * + * @param state HTTP state. TODO: to be removed in the future + * * @return cookie spec */ - private CookieSpec getCookieSpec() { + private CookieSpec getCookieSpec(final HttpState state) { if (this.cookiespec == null) { - this.cookiespec = CookiePolicy.getCookieSpec(this.params.getCookiePolicy()); + int i = state.getCookiePolicy(); + if (i == -1) { + this.cookiespec = CookiePolicy.getCookieSpec(this.params.getCookiePolicy()); + } else { + this.cookiespec = CookiePolicy.getSpecByPolicy(i); + } this.cookiespec.setValidDateFormats( (Collection)this.params.getParameter(HttpMethodParams.DATE_PATTERNS)); } @@ -1160,7 +1167,7 @@ } } - CookieSpec matcher = getCookieSpec(); + CookieSpec matcher = getCookieSpec(state); Cookie[] cookies = matcher.match(conn.getHost(), conn.getPort(), getPath(), conn.isSecure(), state.getCookies()); if ((cookies != null) && (cookies.length > 0)) { @@ -1454,7 +1461,7 @@ headers = getResponseHeaderGroup().getHeaders("set-cookie"); } - CookieSpec parser = getCookieSpec(); + CookieSpec parser = getCookieSpec(state); for (int i = 0; i < headers.length; i++) { Header header = headers[i]; Cookie[] cookies = null; Index: java/org/apache/commons/httpclient/HttpState.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpState.java,v retrieving revision 1.35 diff -u -r1.35 HttpState.java --- java/org/apache/commons/httpclient/HttpState.java 23 Jun 2004 06:50:25 -0000 1.35 +++ java/org/apache/commons/httpclient/HttpState.java 15 Sep 2004 12:38:48 -0000 @@ -83,7 +83,7 @@ private boolean preemptive = false; - private int cookiePolicy = 0; + private int cookiePolicy = -1; // -------------------------------------------------------- Class Variables /** Log object for this class. */ @@ -245,7 +245,7 @@ */ public int getCookiePolicy() { - return CookiePolicy.getDefaultPolicy(); + return this.cookiePolicy; }