diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-04-29 18:30:36 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-04-29 18:30:36 +0000 |
| commit | 1ef1cbc2bf5df453bf5357416b10ffb50a4cec8d (patch) | |
| tree | 3e5839a6515b7c17dc4ade33f115b8bf44b05ece /src/mir_app | |
| parent | e9a8a1ad39685ce31d17971b8af2f6d2b9aff57e (diff) | |
old crutch partially returned back to restore the normal work of proxies
git-svn-id: http://svn.miranda-ng.org/main/trunk@16793 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/clcidents.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/netlib.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/netlibhttp.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/mir_app/src/clcidents.cpp b/src/mir_app/src/clcidents.cpp index 1a21e1fb9a..1048038b42 100644 --- a/src/mir_app/src/clcidents.cpp +++ b/src/mir_app/src/clcidents.cpp @@ -83,12 +83,12 @@ int fnFindItem(HWND hwnd, struct ClcData *dat, DWORD dwItem, ClcContact **contac group->scanIndex = 0;
for (;;) {
if (group->scanIndex == group->cl.count) {
- ClcGroup *tgroup;
group = group->parent;
if (group == NULL)
break;
+
nowVisible = 1;
- for (tgroup = group; tgroup; tgroup = tgroup->parent)
+ for (ClcGroup *tgroup = group; tgroup; tgroup = tgroup->parent)
if (!group->expanded) {
nowVisible = 0;
break;
diff --git a/src/mir_app/src/netlib.h b/src/mir_app/src/netlib.h index 115a5e06a6..0b9bead7ad 100644 --- a/src/mir_app/src/netlib.h +++ b/src/mir_app/src/netlib.h @@ -29,6 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define NLH_PACKETRECVER 'PCKT'
int GetNetlibHandleType(void*);
+#define NLHRF_SMARTREMOVEHOST 0x00000004 // for internal purposes only
+
extern struct SSL_API sslApi;
struct NetlibUser
diff --git a/src/mir_app/src/netlibhttp.cpp b/src/mir_app/src/netlibhttp.cpp index 257aacf9b5..a3657fa79b 100644 --- a/src/mir_app/src/netlibhttp.cpp +++ b/src/mir_app/src/netlibhttp.cpp @@ -448,7 +448,7 @@ INT_PTR NetlibHttpSendRequest(WPARAM wParam, LPARAM lParam) if (ppath && phost)
szHost[ppath - phost] = 0;
- if (!usingProxy)
+ if ((nlhr->flags & NLHRF_SMARTREMOVEHOST) && !usingProxy)
pszUrl = ppath ? ppath : "/";
if (usingProxy && phost && !nlc->dnsThroughProxy) {
@@ -840,6 +840,7 @@ INT_PTR NetlibHttpTransaction(WPARAM wParam, LPARAM lParam) return 0;
NETLIBHTTPREQUEST nlhrSend = *nlhr;
+ nlhrSend.flags |= NLHRF_SMARTREMOVEHOST;
bool doneUserAgentHeader = NetlibHttpFindHeader(nlhr, "User-Agent") != NULL;
bool doneAcceptEncoding = NetlibHttpFindHeader(nlhr, "Accept-Encoding") != NULL;
|