Fix resource header

Closes #87.

src/Requests.jl

@@ -197,11 +197,16 @@ function default_request(method,resource,host,data,user_headers=Dict{Union{},Uni
     Request(method,resource,headers,data)
 end
 
-function default_request(uri::URI,headers,data,method)
-    resource = "$(uri.scheme)://$(uri.host)$(uri.path)"
+function resourcefor(uri::URI)
+    r = uri.path
     if !isempty(uri.query)
-        resource = "$resource?$(uri.query)"
+        r = "$r?$(uri.query)"
     end
+    r
+end
+
+function default_request(uri::URI,headers,data,method)
+    resource = resourcefor(uri)
     if !isempty(uri.userinfo) && !haskey(headers,"Authorization")
         headers["Authorization"] = "Basic $(bytestring(encode(Base64, uri.userinfo)))"
     end

src/streaming.jl

@@ -167,6 +167,7 @@ function open_stream(req::Request, tls_conf=TLS_VERIFY, timeout=Inf,
     if scheme(uri) == "http"
         if !isnull(http_proxy)
             uri = get(http_proxy)
+            connect_method = :tunnel
         end
     elseif scheme(uri) == "https"
         if !isnull(https_proxy)
@@ -176,7 +177,9 @@ function open_stream(req::Request, tls_conf=TLS_VERIFY, timeout=Inf,
     else
         error("Unsupported scheme \"$(scheme(uri))\"")
     end
-
+    if connect_method == :tunnel
+        req.resource = "$(req.uri.scheme)://$(req.uri.host)$(resourcefor(req.uri))"
+    end
     ip = Base.getaddrinfo(uri.host)
     if scheme(req.uri) == "http"
         stream = Base.connect(ip, http_port(uri))