Merge pull request AsyncHttpClient#29 from BluePyth/proxyfix

This pull request fixes my last one and adds a new fix.

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -492,12 +492,16 @@ public void operationComplete(ChannelFuture cf) {
         }
 
     }
+    
+    private static boolean isProxyServer(AsyncHttpClientConfig config, Request request) {
+    	return request.getProxyServer() != null || config.getProxyServer() != null;
+    }
 
     protected final static HttpRequest buildRequest(AsyncHttpClientConfig config, Request request, URI uri,
                                                     boolean allowConnect, ChannelBuffer buffer) throws IOException {
 
         String method = request.getMethod();
-        if (allowConnect && ((request.getProxyServer() != null || config.getProxyServer() != null) && HTTPS.equalsIgnoreCase(uri.getScheme()))) {
+        if (allowConnect && (isProxyServer(config, request) && HTTPS.equalsIgnoreCase(uri.getScheme()))) {
             method = HttpMethod.CONNECT.toString();
         }
         return construct(config, request, new HttpMethod(method), uri, buffer);
@@ -520,9 +524,14 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
         if (m.equals(HttpMethod.CONNECT)) {
             nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_0, m, AsyncHttpProviderUtils.getAuthority(uri));
         } else {
-            StringBuilder path = new StringBuilder(uri.getRawPath());
-            if (uri.getQuery() != null) {
-                path.append("?").append(uri.getRawQuery());
+            StringBuilder path = null;
+            if(isProxyServer(config, request))
+            	path = new StringBuilder(uri.toString());
+            else {
+            	path = new StringBuilder(uri.getRawPath());
+	            if (uri.getQuery() != null) {
+	                path.append("?").append(uri.getRawQuery());
+	            }
             }
             nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, m, path.toString());
         }
@@ -631,7 +640,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
             }
 
             if (proxyServer.getPrincipal() != null) {
-                if (proxyServer.getNtlmDomain() != "") {
+                if (proxyServer.getNtlmDomain() != null && proxyServer.getNtlmDomain().length() > 0) {
 
                     List<String> auth = request.getHeaders().get(HttpHeaders.Names.PROXY_AUTHORIZATION);
                     if (!(auth != null && auth.size() > 0 && auth.get(0).startsWith("NTLM"))) {