Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed binary incompatibilities with 4.4 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1677102 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2015-05-01 09:09:09 +00:00
parent 2ce0bdccc0
commit 68d48b3fd4
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
View File

@ -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);
}

38
httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265CookieSpecBase.java Normal file
View File

@ -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);
}
}

2
httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java
View File

@ -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(),

2
httpclient/src/main/java/org/apache/http/impl/cookie/RFC6265StrictSpec.java
View File

@ -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,