Fix #1878

Author: yhirose

httplib.h

@@ -3296,81 +3296,83 @@ socket_t create_socket(const std::string &host, const std::string &ip, int port,
     return INVALID_SOCKET;
   }
 
-  for (auto rp = result; rp; rp = rp->ai_next) {
-    // Create a socket
+  // Create a socket
 #ifdef _WIN32
-    auto sock =
-        WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol, nullptr, 0,
-                   WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
-    /**
-     * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
-     * and above the socket creation fails on older Windows Systems.
-     *
-     * Let's try to create a socket the old way in this case.
-     *
-     * Reference:
-     * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
-     *
-     * WSA_FLAG_NO_HANDLE_INHERIT:
-     * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
-     * SP1, and later
-     *
-     */
-    if (sock == INVALID_SOCKET) {
-      sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    }
+  auto sock =
+      WSASocketW(result->ai_family, result->ai_socktype, result->ai_protocol,
+                 nullptr, 0, WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED);
+  /**
+   * Since the WSA_FLAG_NO_HANDLE_INHERIT is only supported on Windows 7 SP1
+   * and above the socket creation fails on older Windows Systems.
+   *
+   * Let's try to create a socket the old way in this case.
+   *
+   * Reference:
+   * https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasocketa
+   *
+   * WSA_FLAG_NO_HANDLE_INHERIT:
+   * This flag is supported on Windows 7 with SP1, Windows Server 2008 R2 with
+   * SP1, and later
+   *
+   */
+  if (sock == INVALID_SOCKET) {
+    sock = socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+  }
 #else
 
 #ifdef SOCK_CLOEXEC
-    auto sock =
-        socket(rp->ai_family, rp->ai_socktype | SOCK_CLOEXEC, rp->ai_protocol);
+  auto sock = socket(result->ai_family, result->ai_socktype | SOCK_CLOEXEC,
+                     result->ai_protocol);
 #else
-    auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+  auto sock =
+      socket(result->ai_family, result->ai_socktype, result->ai_protocol);
 #endif
 
 #endif
-    if (sock == INVALID_SOCKET) { continue; }
+  if (sock == INVALID_SOCKET) {
+    freeaddrinfo(result);
+    return INVALID_SOCKET;
+  }
 
 #if !defined _WIN32 && !defined SOCK_CLOEXEC
-    if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
-      close_socket(sock);
-      continue;
-    }
+  if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
+    close_socket(sock);
+    freeaddrinfo(result);
+    return INVALID_SOCKET;
+  }
 #endif
 
-    if (tcp_nodelay) {
-      auto yes = 1;
+  if (tcp_nodelay) {
+    auto yes = 1;
 #ifdef _WIN32
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const char *>(&yes), sizeof(yes));
+    setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+               reinterpret_cast<const char *>(&yes), sizeof(yes));
 #else
-      setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
-                 reinterpret_cast<const void *>(&yes), sizeof(yes));
+    setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
+               reinterpret_cast<const void *>(&yes), sizeof(yes));
 #endif
-    }
+  }
 
-    if (socket_options) { socket_options(sock); }
+  if (socket_options) { socket_options(sock); }
 
-    if (rp->ai_family == AF_INET6) {
-      auto no = 0;
+  if (result->ai_family == AF_INET6) {
+    auto no = 0;
 #ifdef _WIN32
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const char *>(&no), sizeof(no));
+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+               reinterpret_cast<const char *>(&no), sizeof(no));
 #else
-      setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 reinterpret_cast<const void *>(&no), sizeof(no));
+    setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+               reinterpret_cast<const void *>(&no), sizeof(no));
 #endif
-    }
-
-    // bind or connect
-    if (bind_or_connect(sock, *rp)) {
-      freeaddrinfo(result);
-      return sock;
-    }
+  }
 
-    close_socket(sock);
+  // bind or connect
+  if (bind_or_connect(sock, *result)) {
+    freeaddrinfo(result);
+    return sock;
   }
 
+  close_socket(sock);
   freeaddrinfo(result);
   return INVALID_SOCKET;
 }