hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1677102 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl: client/HttpClientBuilder.java cookie/RFC6265CookieSpecBase.java cookie/RFC6265LaxSpec.java cookie/RFC6265StrictSpec.java
Date Fri, 01 May 2015 09:09:09 GMT
Author: olegk
Date: Fri May  1 09:09:09 2015
New Revision: 1677102

URL: http://svn.apache.org/r1677102
Log:
Fixed binary incompatibilities with 4.4

Added:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java
      - copied, changed from r1676713, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1677102&r1=1677101&r2=1677102&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
Fri May  1 09:09:09 2015
@@ -287,7 +287,7 @@ public class HttpClientBuilder {
      * @deprecated (4.5) use {@link #setSSLContext(SSLContext)}
      */
     @Deprecated
-    public final HttpClientBuilder setSslContext(final SSLContext sslcontext) {
+    public final HttpClientBuilder setSslcontext(final SSLContext sslcontext) {
         return setSSLContext(sslcontext);
     }
 

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java
(from r1676713, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java&r1=1676713&r2=1677102&rev=1677102&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java
Fri May  1 09:09:09 2015
@@ -27,35 +27,12 @@
 
 package org.apache.http.impl.cookie;
 
-import org.apache.http.annotation.ThreadSafe;
 import org.apache.http.cookie.CommonCookieAttributeHandler;
 
-/**
- * Standard {@link org.apache.http.cookie.CookieSpec} implementation that enforces a more
relaxed
- * interpretation of the HTTP state management specification (RFC 6265, section 5)
- * for interoperability with existing servers that do not conform to the well behaved profile
- * (RFC 6265, section 4).
- *
- * @since 4.4
- */
-@ThreadSafe
-public class RFC6265LaxSpec extends RFC6265CookieSpec {
+class RFC6265CookieSpecBase extends RFC6265CookieSpec {
 
-    public RFC6265LaxSpec() {
-        super(new BasicPathHandler(),
-                new BasicDomainHandler(),
-                new LaxMaxAgeHandler(),
-                new BasicSecureHandler(),
-                new LaxExpiresHandler());
-    }
-
-    RFC6265LaxSpec(final CommonCookieAttributeHandler... handlers) {
+    RFC6265CookieSpecBase(final CommonCookieAttributeHandler... handlers) {
         super(handlers);
     }
 
-    @Override
-    public String toString() {
-        return "rfc6265-lax";
-    }
-
 }

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java?rev=1677102&r1=1677101&r2=1677102&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
Fri May  1 09:09:09 2015
@@ -39,7 +39,7 @@ import org.apache.http.cookie.CommonCook
  * @since 4.4
  */
 @ThreadSafe
-public class RFC6265LaxSpec extends RFC6265CookieSpec {
+public class RFC6265LaxSpec extends RFC6265CookieSpecBase {
 
     public RFC6265LaxSpec() {
         super(new BasicPathHandler(),

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java?rev=1677102&r1=1677101&r2=1677102&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
Fri May  1 09:09:09 2015
@@ -39,7 +39,7 @@ import org.apache.http.cookie.CommonCook
  * @since 4.4
  */
 @ThreadSafe
-public class RFC6265StrictSpec extends RFC6265CookieSpec {
+public class RFC6265StrictSpec extends RFC6265CookieSpecBase {
 
     final static String[] DATE_PATTERNS = {
         DateUtils.PATTERN_RFC1123,



Mime
View raw message