debug

Author: saghul

src/curl-utils.c

@@ -166,11 +166,15 @@ static void uv__poll_cb(uv_poll_t *handle, int status, int events) {
     CHECK_NOT_NULL(qrt);
 
     int flags = 0;
-    if (events & UV_READABLE) {
-        flags |= CURL_CSELECT_IN;
-    }
-    if (events & UV_WRITABLE) {
-        flags |= CURL_CSELECT_OUT;
+    if (status != 0) {
+        flags |= CURL_CSELECT_ERR;
+    } else {
+        if (events & UV_READABLE) {
+            flags |= CURL_CSELECT_IN;
+        }
+        if (events & UV_WRITABLE) {
+            flags |= CURL_CSELECT_OUT;
+        }
     }
 
     int running_handles;
@@ -198,17 +202,17 @@ static int curl__handle_socket(CURL *easy, curl_socket_t s, int action, void *us
                 if (r != 0) {
                     fprintf(stderr, "uv_poll_init_socket error: %d socket: %d\n", r, s);
                     fflush(stderr);
-                    CHECK_EQ(r, 0);
+                    //CHECK_EQ(r, 0);
+                    return -1;
                 }
                 poll_ctx->qrt = qrt;
                 poll_ctx->sockfd = s;
                 poll_ctx->poll.data = poll_ctx;
+                curl_multi_assign(qrt->curl_ctx.curlm_h, s, (void *) poll_ctx);
             } else {
                 poll_ctx = socketp;
             }
 
-            curl_multi_assign(qrt->curl_ctx.curlm_h, s, (void *) poll_ctx);
-
             int events = 0;
             if (action != CURL_POLL_IN) {
                 events |= UV_WRITABLE;
@@ -228,8 +232,8 @@ static int curl__handle_socket(CURL *easy, curl_socket_t s, int action, void *us
                 uv_close((uv_handle_t *) &poll_ctx->poll, uv__poll_close_cb);
             }
             break;
-        default:
-            abort();
+        case CURL_POLL_NONE:
+            break;
     }
 
     return 0;