From e977781087022ba31151ba73be9cadc36e0284f8 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 1 Nov 2002 11:22:03 +0000 Subject: [PATCH] Fixed a bug with HTTP proxy detection - Joost can finally use NSIS-dl :D git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1518 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Makensisw/makensisw.cpp | 19 +++++++++++-------- Contrib/NSISdl/nsisdl.cpp | 11 ++++++----- Plugins/nsisdl.dll | Bin 12800 -> 12800 bytes 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index c758b623..2ce89324 100644 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp @@ -525,14 +525,17 @@ DWORD CALLBACK UpdateThread(LPVOID v) { static char pbuf[8192]; char *p=NULL; *response = 0; - if (getProxyInfo(pbuf)) { - p=my_strstr(pbuf,"http="); - if (!p) p=pbuf; - else { - p+=5; - char *tp=my_strstr(p,";"); - if (tp) *tp=0; - } + if (getProxyInfo(pbuf)) + { + p=my_strstr(pbuf,"http="); + if (!p) p=pbuf; + else { + p+=5; + } + char *tp=my_strstr(p,";"); + if (tp) *tp=0; + char *p2=my_strstr(p,"="); + if (p2) p=0; // we found the wrong proxy } if (!g_dns) { g_dns = new JNL_AsyncDNS(); diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 999e670a..de6447a3 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -146,14 +146,15 @@ void downloadFile(char *url, char *p=NULL; if (getProxyInfo(buf)) { - p=_strstr(buf,"http="); + p=strstr(buf,"http="); if (!p) p=buf; - else - { + else { p+=5; - char *tp=_strstr(p,";"); - if (tp) *tp=0; } + char *tp=strstr(p,";"); + if (tp) *tp=0; + char *p2=strstr(p,"="); + if (p2) p=0; // we found the wrong proxy } DWORD start_time=GetTickCount(); JNL_HTTPGet *get=new JNL_HTTPGet(JNL_CONNECTION_AUTODNS,16384,(p&&p[0])?p:NULL); diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index 51020545cb41d7c169bb22c7df3b0d3a5ed4200c..42dc04bf0450136e6f156abbe55f44605ca7e3c1 100644 GIT binary patch delta 3172 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 BJ^}y$