From ecfced822ef36eea652b0db29a3b5174b6df76ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 31 Mar 2009 09:32:31 +0000
Subject: [PATCH] resolve missing last proxy in proxy detection

---
 proxyface/windoze.hxx | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/proxyface/windoze.hxx b/proxyface/windoze.hxx
index aad9cde..4ab8312 100644
--- a/proxyface/windoze.hxx
+++ b/proxyface/windoze.hxx
@@ -11,11 +11,7 @@
 #include <windows.h>
 #include <winhttp.h>
 
-#ifdef QT_NETWORK_LIB
-#include <QtCore/QDebug> // debug
-#else
 #include <iostream> // debug
-#endif
 
 namespace proxy {
 
@@ -54,14 +50,10 @@ namespace proxy {
             throw exc::error();
           
           std::wstring list(proxyInfo.lpszProxy);
-#ifdef QT_NETWORK_LIB
-          qDebug()<<"LIST=\""<<proxyInfo.lpszProxy<<"\"";
-#else
           std::wcout<<"LIST=\""<<list<<"\""<<std::endl;
-#endif
           for (std::wstring::size_type oldpos(0), pos(0);
-               (pos=list.find(L";", oldpos))!=std::wstring::npos;
-               oldpos=++pos) {
+               (pos=list.find(L";", oldpos)), oldpos!=std::wstring::npos;
+               oldpos=(pos!=std::wstring::npos?pos+1:pos)) {
             std::wstring proxy(list.substr(oldpos, pos-oldpos));
             std::wstring port((oldpos=proxy.rfind(L":"))!=std::wstring::npos
                               ?proxy.substr(oldpos+1):std::wstring());
@@ -72,9 +64,10 @@ namespace proxy {
               case WINHTTP_ACCESS_TYPE_DEFAULT_PROXY: type=DEFAULT; break;
               case WINHTTP_ACCESS_TYPE_NAMED_PROXY: type=HTTP; break;
             }
-            res.push_back(Proxy(type,
-                                std::string(host.begin(), host.end()),
-                                std::string(port.begin(), port.end())));
+            if (host.size()>0)
+              res.push_back(Proxy(type,
+                                  std::string(host.begin(), host.end()),
+                                  std::string(port.begin(), port.end())));
           }
           if (!res.size()) res.push_back(Proxy());