Revert "Fix curl GH test"

This reverts commit 0bff693.

Author: embhorn

examples/mqttnet.c

@@ -737,16 +737,22 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
 
     if (timeout_ms != 0) {
         res = curl_easy_setopt(sock->curl, CURLOPT_CONNECTTIMEOUT_MS,
-                               (long)timeout_ms);
+                               timeout_ms);
 
         if (res != CURLE_OK) {
             PRINTF("error: curl_easy_setopt(CONNECTTIMEOUT_MS, %d) "
                    "returned %d", timeout_ms, res);
             return MQTT_CODE_ERROR_CURL;
         }
-        /* Note: CURLOPT_TIMEOUT_MS is not used here because it sets a total
-         * transfer timeout, which is not applicable with CURLOPT_CONNECT_ONLY
-         * mode where we use curl_easy_send/recv manually after connect. */
+
+        res = curl_easy_setopt(sock->curl, CURLOPT_TIMEOUT_MS,
+                               timeout_ms);
+
+        if (res != CURLE_OK) {
+            PRINTF("error: curl_easy_setopt(TIMEOUT_MS, %d) "
+                   "returned %d", timeout_ms, res);
+            return MQTT_CODE_ERROR_CURL;
+        }
     }
 
     res = curl_easy_setopt(sock->curl, CURLOPT_URL, host);
@@ -757,7 +763,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         return MQTT_CODE_ERROR_CURL;
     }
 
-    res = curl_easy_setopt(sock->curl, CURLOPT_PORT, (long)port);
+    res = curl_easy_setopt(sock->curl, CURLOPT_PORT, port);
 
     if (res != CURLE_OK) {
         PRINTF("error: curl_easy_setopt(PORT, %d) returned: %d",
@@ -839,7 +845,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         */
 
         /* Set peer and host verification. */
-        res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1L);
+        res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYPEER, 1);
 
         if (res != CURLE_OK) {
             PRINTF("error: curl_easy_setopt(SSL_VERIFYPEER) returned: %d",
@@ -850,10 +856,10 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
         /* Only do server host verification when not running against
          * localhost broker. */
         if (XSTRCMP(host, "localhost") == 0) {
-            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0L);
+            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 0);
         }
         else {
-            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2L);
+            res = curl_easy_setopt(sock->curl, CURLOPT_SSL_VERIFYHOST, 2);
         }
 
         if (res != CURLE_OK) {
@@ -892,7 +898,7 @@ mqttcurl_connect(SocketContext* sock, const char* host, word16 port,
     }
     #endif
 
-    res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1L);
+    res = curl_easy_setopt(sock->curl, CURLOPT_CONNECT_ONLY, 1);
 
     if (res != CURLE_OK) {
         PRINTF("error: curl_easy_setopt(CONNECT_ONLY, 1) returned: %d",