Follow-up to HTTPCLIENT-853

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@781075 13f79535-47bb-0310-9956-ffa450edef68

httpclient/src/main/java/org/apache/http/client/protocol/ClientContext.java

@@ -39,6 +39,11 @@ package org.apache.http.client.protocol;
  */
 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.

httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java

@@ -152,7 +152,7 @@ public class RequestAddCookies implements HttpRequestInterceptor {
 
             // 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);

httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java

@@ -209,6 +209,9 @@ public class DefaultHttpClient extends AbstractHttpClient {
     @Override
     protected HttpContext createHttpContext() {
         HttpContext context = new BasicHttpContext();
+        context.setAttribute(
+                ClientContext.SCHEME_REGISTRY, 
+                getConnectionManager().getSchemeRegistry());
         context.setAttribute(
                 ClientContext.AUTHSCHEME_REGISTRY, 
                 getAuthSchemes());