You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by kw...@apache.org on 2013/05/07 00:18:23 UTC
svn commit: r1479699 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt
httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
Author: kwright
Date: Mon May 6 22:18:21 2013
New Revision: 1479699
URL: http://svn.apache.org/r1479699
Log:
Fix for HTTPCLIENT-1264.
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1479699&r1=1479698&r2=1479699&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Mon May 6 22:18:21 2013
@@ -1,6 +1,11 @@
Changes since release 4.3 BETA1
-------------------
+* [HTTPCLIENT-1264] Add support for multiple levels of browser compatibility
+ to BrowserCompatSpec and BrowserCompatSpecFactory. Include constructor
+ argument for IE medium-security compatibility.
+ Contributed by Karl Wright (kwright at apache.org)
+
* [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as
the keystore password.
Contributed by David Graff <djgraff209 at gmail.com>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java?rev=1479699&r1=1479698&r2=1479699&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java Mon May 6 22:18:21 2013
@@ -59,6 +59,7 @@ import org.apache.http.util.CharArrayBuf
@NotThreadSafe // superclass is @NotThreadSafe
public class BrowserCompatSpec extends CookieSpecBase {
+
private static final String[] DEFAULT_DATE_PATTERNS = new String[] {
DateUtils.PATTERN_RFC1123,
DateUtils.PATTERN_RFC1036,
@@ -77,16 +78,34 @@ public class BrowserCompatSpec extends C
};
private final String[] datepatterns;
+ private final BrowserCompatSpecFactory.SecurityLevel securityLevel;
/** Default constructor */
- public BrowserCompatSpec(final String[] datepatterns) {
+ public BrowserCompatSpec(final String[] datepatterns, final BrowserCompatSpecFactory.SecurityLevel securityLevel) {
super();
+ this.securityLevel = securityLevel;
if (datepatterns != null) {
this.datepatterns = datepatterns.clone();
} else {
this.datepatterns = DEFAULT_DATE_PATTERNS;
}
- registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler());
+ switch (securityLevel) {
+ case SECURITYLEVEL_DEFAULT:
+ registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler());
+ break;
+ case SECURITYLEVEL_IE_MEDIUM:
+ registerAttribHandler(ClientCookie.PATH_ATTR, new BasicPathHandler() {
+ @Override
+ public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+ // No validation
+ }
+ }
+ );
+ break;
+ default:
+ throw new RuntimeException("Unknown security level");
+ }
+
registerAttribHandler(ClientCookie.DOMAIN_ATTR, new BasicDomainHandler());
registerAttribHandler(ClientCookie.MAX_AGE_ATTR, new BasicMaxAgeHandler());
registerAttribHandler(ClientCookie.SECURE_ATTR, new BasicSecureHandler());
@@ -97,8 +116,13 @@ public class BrowserCompatSpec extends C
}
/** Default constructor */
+ public BrowserCompatSpec(final String[] datepatterns) {
+ this(datepatterns, BrowserCompatSpecFactory.SecurityLevel.SECURITYLEVEL_DEFAULT);
+ }
+
+ /** Default constructor */
public BrowserCompatSpec() {
- this(null);
+ this(null, BrowserCompatSpecFactory.SecurityLevel.SECURITYLEVEL_DEFAULT);
}
public List<Cookie> parse(final Header header, final CookieOrigin origin)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java?rev=1479699&r1=1479698&r2=1479699&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java Mon May 6 22:18:21 2013
@@ -47,15 +47,26 @@ import org.apache.http.protocol.HttpCont
@SuppressWarnings("deprecation")
public class BrowserCompatSpecFactory implements CookieSpecFactory, CookieSpecProvider {
+ public enum SecurityLevel {
+ SECURITYLEVEL_DEFAULT,
+ SECURITYLEVEL_IE_MEDIUM
+ };
+
private final String[] datepatterns;
+ private final SecurityLevel securityLevel;
- public BrowserCompatSpecFactory(final String[] datepatterns) {
+ public BrowserCompatSpecFactory(final String[] datepatterns, SecurityLevel securityLevel) {
super();
this.datepatterns = datepatterns;
+ this.securityLevel = securityLevel;
+ }
+
+ public BrowserCompatSpecFactory(final String[] datepatterns) {
+ this(null, SecurityLevel.SECURITYLEVEL_DEFAULT);
}
public BrowserCompatSpecFactory() {
- this(null);
+ this(null, SecurityLevel.SECURITYLEVEL_DEFAULT);
}
public CookieSpec newInstance(final HttpParams params) {
@@ -68,9 +79,9 @@ public class BrowserCompatSpecFactory im
patterns = new String[param.size()];
patterns = param.toArray(patterns);
}
- return new BrowserCompatSpec(patterns);
+ return new BrowserCompatSpec(patterns, securityLevel);
} else {
- return new BrowserCompatSpec();
+ return new BrowserCompatSpec(null, securityLevel);
}
}