Merge branch 'master' of gitlab.pcloud.com:pcloud/synclib

virco · virco · commit 94bcb6bc2320 · 2016-12-21T18:57:17.000+02:00
diff --git a/pcompat.c b/pcompat.c
@@ -1269,7 +1269,7 @@ static void detect_proxy(){
       debug(D_NOTICE, "WinHttpOpen failed");
       goto manual;
     }
-    memset(aopt, 0, sizeof(aopt));
+    memset(&aopt, 0, sizeof(aopt));
     aopt.dwFlags=WINHTTP_AUTOPROXY_AUTO_DETECT;
     aopt.dwAutoDetectFlags=WINHTTP_AUTO_DETECT_TYPE_DHCP|WINHTTP_AUTO_DETECT_TYPE_DNS_A;
     if (ieconf.lpszAutoConfigUrl){

Original file line number	Diff line number	Diff line change
`@@ -1269,7 +1269,7 @@ static void detect_proxy(){`
`1269`	`1269`	`debug(D_NOTICE, "WinHttpOpen failed");`
`1270`	`1270`	`goto manual;`
`1271`	`1271`	`}`
`1272`		`- memset(aopt, 0, sizeof(aopt));`
	`1272`	`+ memset(&aopt, 0, sizeof(aopt));`
`1273`	`1273`	`aopt.dwFlags=WINHTTP_AUTOPROXY_AUTO_DETECT;`
`1274`	`1274`	`aopt.dwAutoDetectFlags=WINHTTP_AUTO_DETECT_TYPE_DHCP\|WINHTTP_AUTO_DETECT_TYPE_DNS_A;`
`1275`	`1275`	`if (ieconf.lpszAutoConfigUrl){`