You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2009/06/02 18:18:13 UTC
svn commit: r781075 - in
/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http:
client/protocol/ClientContext.java client/protocol/RequestAddCookies.java
impl/client/DefaultHttpClient.java
Author: olegk
Date: Tue Jun 2 16:18:12 2009
New Revision: 781075
URL: http://svn.apache.org/viewvc?rev=781075&view=rev
Log:
Follow-up to HTTPCLIENT-853
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java?rev=781075&r1=781074&r2=781075&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java Tue Jun 2 16:18:12 2009
@@ -40,6 +40,11 @@
public interface ClientContext {
/**
+ * Attribute name of a {@link org.apache.http.conn.scheme.Scheme}
+ * object that represents the actual protocol scheme registry.
+ */
+ public static final String SCHEME_REGISTRY = "http.scheme-registry";
+ /**
* Attribute name of a {@link org.apache.http.cookie.CookieSpecRegistry}
* object that represents the actual cookie specification registry.
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=781075&r1=781074&r2=781075&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Tue Jun 2 16:18:12 2009
@@ -152,7 +152,7 @@
// Obtain the scheme registry
SchemeRegistry sr = (SchemeRegistry) context.getAttribute(
- ClientContext.AUTHSCHEME_REGISTRY);
+ ClientContext.SCHEME_REGISTRY);
if (sr != null) {
Scheme scheme = sr.get(targetHost.getSchemeName());
port = scheme.resolvePort(port);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java?rev=781075&r1=781074&r2=781075&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java Tue Jun 2 16:18:12 2009
@@ -210,6 +210,9 @@
protected HttpContext createHttpContext() {
HttpContext context = new BasicHttpContext();
context.setAttribute(
+ ClientContext.SCHEME_REGISTRY,
+ getConnectionManager().getSchemeRegistry());
+ context.setAttribute(
ClientContext.AUTHSCHEME_REGISTRY,
getAuthSchemes());
context.setAttribute(