Merge remote-tracking branch 'origin/master' into spdy

2 files changed, 4 insertions, 4 deletions

diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
index 9e03461..4ec7d80 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSSLSocketMiddleware.java
@@ -26,7 +26,7 @@ public class AsyncSSLSocketMiddleware extends AsyncSocketMiddleware {
         super(client, "https", 443);
     }
 
-    SSLContext sslContext;
+    protected SSLContext sslContext;
 
     public void setSSLContext(SSLContext sslContext) {
         this.sslContext = sslContext;
@@ -36,13 +36,13 @@ public class AsyncSSLSocketMiddleware extends AsyncSocketMiddleware {
         return sslContext != null ? sslContext : AsyncSSLSocketWrapper.getDefaultSSLContext();
     }
 
-    TrustManager[] trustManagers;
+    protected TrustManager[] trustManagers;
 
     public void setTrustManagers(TrustManager[] trustManagers) {
         this.trustManagers = trustManagers;
     }
 
-    HostnameVerifier hostnameVerifier;
+    protected HostnameVerifier hostnameVerifier;
 
     public void setHostnameVerifier(HostnameVerifier hostnameVerifier) {
         this.hostnameVerifier = hostnameVerifier;
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
index a50ff9a..6e7d692 100644
--- a/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
+++ b/AndroidAsync/src/com/koushikdutta/async/http/AsyncSocketMiddleware.java
@@ -50,7 +50,7 @@ public class AsyncSocketMiddleware extends SimpleMiddleware {
         this(client, "http", 80);
     }
 
-    AsyncHttpClient mClient;
+    protected AsyncHttpClient mClient;
 
     protected ConnectCallback wrapCallback(ConnectCallback callback, Uri uri, int port, boolean proxied) {
         return callback;