Merge branch '10.3' into 10.4

vaintroub · vaintroub · commit f1c35a996f72 · 2020-06-01T15:43:14.000+02:00
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
@@ -326,7 +326,7 @@ static bool IsPortInUse(unsigned short port)
   }
 
   bool in_use = false;
-  if (bind(ip_sock, a->ai_addr, a->ai_addrlen) == SOCKET_ERROR)
+  if (bind(ip_sock, a->ai_addr, (int)a->ai_addrlen) == SOCKET_ERROR)
   {
     DWORD last_error = WSAGetLastError();
     in_use = (last_error ==  WSAEADDRINUSE || last_error == WSAEACCES);

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ static bool IsPortInUse(unsigned short port)`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`bool in_use = false;`
`329`		`- if (bind(ip_sock, a->ai_addr, a->ai_addrlen) == SOCKET_ERROR)`
	`329`	`+ if (bind(ip_sock, a->ai_addr, (int)a->ai_addrlen) == SOCKET_ERROR)`
`330`	`330`	`{`
`331`	`331`	`DWORD last_error = WSAGetLastError();`
`332`	`332`	`in_use = (last_error == WSAEADDRINUSE \|\| last_error == WSAEACCES);`