From 3be7d0d9e398345637ffbec563a43ba2feb66e43 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 21 Oct 2005 14:05:53 +0000
Subject: [PATCH] applied patch #1334166 - nsisdl: /PROXY switch

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4338 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/NSISdl/nsisdl.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp
index 8336cb9d..6bb0a67e 100644
--- a/Contrib/NSISdl/nsisdl.cpp
+++ b/Contrib/NSISdl/nsisdl.cpp
@@ -230,9 +230,11 @@ __declspec(dllexport) void download (HWND   parent,
   char buf[1024];
   char url[1024];
   char filename[1024];
+  static char proxy[1024];
   BOOL bSuccess=FALSE;
   int timeout_ms=30000;
   int getieproxy=1;
+  int manualproxy=0;
 
   char *error=NULL;
 
@@ -274,7 +276,13 @@ __declspec(dllexport) void download (HWND   parent,
     timeout_ms=my_atoi(url+9);
     popstring(url);
   }
-  if (!lstrcmpi(url, "/NOIEPROXY")) {
+  if (!lstrcmpi(url, "/PROXY")) {
+    getieproxy=0;
+    manualproxy=1;
+    popstring(proxy);
+    popstring(url);
+  }
+  else if (!lstrcmpi(url, "/NOIEPROXY")) {
     getieproxy=0;
     popstring(url);
   }
@@ -340,6 +348,9 @@ __declspec(dllexport) void download (HWND   parent,
         buf[8192-1]=0;
         RegCloseKey(hKey);
       }
+      if(manualproxy == 1){
+        p = proxy;
+      }
 
       DWORD start_time=GetTickCount();
       get=new JNL_HTTPGet(JNL_CONNECTION_AUTODNS,16384,(p&&p[0])?p:NULL);