0
@@ -73,6 +73,15 @@ shoes_winhttp(LPCWSTR host, INTERNET_PORT port, LPCWSTR path, TCHAR **mem, ULONG
0
   if (sess == NULL)
0
     goto done;
0
 
0
+  conn = WinHttpConnect(sess, host, port, 0);
0
+  if (conn == NULL)
0
+    goto done;
0
+
0
+  req = WinHttpOpenRequest(conn, L"GET", path,
0
+    NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0);
0
+  if (req == NULL)
0
+    goto done;
0
+
0
   proxy = _wgetenv(L"http_proxy");
0
   if (proxy != NULL)
0
   {
0
@@ -80,24 +89,15 @@ shoes_winhttp(LPCWSTR host, INTERNET_PORT port, LPCWSTR path, TCHAR **mem, ULONG
0
     proxy_info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
0
     proxy_info.lpszProxy = proxy;
0
     proxy_info.lpszProxyBypass = NULL;
0
-    WinHttpSetOption(sess, WINHTTP_OPTION_PROXY, &proxy_info, sizeof(proxy_info));
0
+    WinHttpSetOption(req, WINHTTP_OPTION_PROXY, &proxy_info, sizeof(proxy_info));
0
   }
0
 
0
   if (!(flags & SHOES_DL_REDIRECTS))
0
   {
0
     DWORD options = WINHTTP_DISABLE_REDIRECTS;
0
-    WinHttpSetOption(sess, WINHTTP_OPTION_DISABLE_FEATURE, &options, sizeof(options));
0
+    WinHttpSetOption(req, WINHTTP_OPTION_DISABLE_FEATURE, &options, sizeof(options));
0
   }
0
 
0
-  conn = WinHttpConnect(sess, host, port, 0);
0
-  if (conn == NULL)
0
-    goto done;
0
-
0
-  req = WinHttpOpenRequest(conn, L"GET", path,
0
-    NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0);
0
-  if (req == NULL)
0
-    goto done;
0
-
0
   if (!WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0,
0
     NULL, 0, 0, 0))
0
     goto done;