curl-7.58.0.patch

diff --git a/lib/connect.c b/lib/connect.c
index 3edb71eb7..b81a7db87 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -109,6 +109,9 @@ static void
 tcpkeepalive(struct Curl_easy *data,
              curl_socket_t sockfd)
 {
+  (void) sockfd;
+  infof(data, "SO_KEEPALIVE is not supported on 3DS\n");
+#if 0
   int optval = data->set.tcp_keepalive?1:0;
 
   /* only set IDLE and INTVL if setting KEEPALIVE is successful */
@@ -160,6 +163,7 @@ tcpkeepalive(struct Curl_easy *data,
 #endif
 #endif
   }
+#endif
 }
 
 static CURLcode
@@ -484,7 +488,7 @@ static CURLcode bindlocal(struct connectdata *conn,
 static bool verifyconnect(curl_socket_t sockfd, int *error)
 {
   bool rc = TRUE;
-#ifdef SO_ERROR
+#if 0
   int err = 0;
   curl_socklen_t errSize = sizeof(err);
 
diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 95a3f1050..ff7fb3669 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -151,9 +151,11 @@ Curl_getaddrinfo_ex(const char *nodename,
     if((ai->ai_addr == NULL) || !(ai->ai_addrlen > 0))
       continue;
 
+#if 0 // 3DS socu returns ai_addrlen = 8
     /* ignore elements with bogus address size */
     if((size_t)ai->ai_addrlen < ss_size)
       continue;
+#endif
 
     ca = malloc(sizeof(Curl_addrinfo));
     if(!ca) {