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
This commit is contained in:
kichik 2005-10-21 14:05:53 +00:00
parent 3b941a1e07
commit 3be7d0d9e3

View file

@ -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);