From 68d48b3fd488ce1a1f585fe3bf242df220d382d8 Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Fri, 1 May 2015 09:09:09 +0000
Subject: [PATCH] Fixed binary incompatibilities with 4.4

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1677102 13f79535-47bb-0310-9956-ffa450edef68
---
 .../http/impl/client/HttpClientBuilder.java   |  2 +-
 .../impl/cookie/RFC6265CookieSpecBase.java    | 38 +++++++++++++++++++
 .../http/impl/cookie/RFC6265LaxSpec.java      |  2 +-
 .../http/impl/cookie/RFC6265StrictSpec.java   |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java

diff --git a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
index f408f9e7f..caef84d65 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
@@ -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);
     }
 
diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java
new file mode 100644
index 000000000..91acb9a19
--- /dev/null
+++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java
@@ -0,0 +1,38 @@
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.impl.cookie;
+
+import org.apache.http.cookie.CommonCookieAttributeHandler;
+
+class RFC6265CookieSpecBase extends RFC6265CookieSpec {
+
+    RFC6265CookieSpecBase(final CommonCookieAttributeHandler... handlers) {
+        super(handlers);
+    }
+
+}
diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
index 0534f5a56..8455c8342 100644
--- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
+++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
@@ -39,7 +39,7 @@ import org.apache.http.cookie.CommonCookieAttributeHandler;
  * @since 4.4
  */
 @ThreadSafe
-public class RFC6265LaxSpec extends RFC6265CookieSpec {
+public class RFC6265LaxSpec extends RFC6265CookieSpecBase {
 
     public RFC6265LaxSpec() {
         super(new BasicPathHandler(),
diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
index 360d3a544..1765d276f 100644
--- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
+++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
@@ -39,7 +39,7 @@ import org.apache.http.cookie.CommonCookieAttributeHandler;
  * @since 4.4
  */
 @ThreadSafe
-public class RFC6265StrictSpec extends RFC6265CookieSpec {
+public class RFC6265StrictSpec extends RFC6265CookieSpecBase {
 
     final static String[] DATE_PATTERNS = {
         DateUtils.PATTERN_RFC1123,