From: Ilya Kosarev <i.kosarev@tarantool.org> To: tarantool-patches@freelists.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v3 2/4] http: remove redundant & incorrect case for curl_request code Date: Mon, 28 Oct 2019 18:51:47 +0300 [thread overview] Message-ID: <026268b0080a542fa413a69dd07b18b8bc514960.1572276894.git.i.kosarev@tarantool.org> (raw) In-Reply-To: <cover.1572276894.git.i.kosarev@tarantool.org> In-Reply-To: <cover.1572276894.git.i.kosarev@tarantool.org> After executing curl request we need to process curl_request code. It might be CURL_WRITE_ERROR. We had special case for it, which assumed diagnostic being set and contained corresponding assert, though it is incorrect. Better way is to handle it as any other non-standard event. Part of #4232 --- src/httpc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/httpc.c b/src/httpc.c index 146a6f067..22b54d16a 100644 --- a/src/httpc.c +++ b/src/httpc.c @@ -445,16 +445,12 @@ httpc_execute(struct httpc_request *req, double timeout) case CURLE_COULDNT_RESOLVE_PROXY: case CURLE_COULDNT_RESOLVE_HOST: case CURLE_COULDNT_CONNECT: + case CURLE_WRITE_ERROR: /* 595 Connection Problem (AnyEvent non-standard) */ req->status = 595; req->reason = curl_easy_strerror(req->curl_request.code); ++env->stat.failed_requests; break; - case CURLE_WRITE_ERROR: - /* Diag is already set by curl_write_cb() */ - assert(!diag_is_empty(&fiber()->diag)); - ++env->stat.failed_requests; - return -1; case CURLE_OUT_OF_MEMORY: diag_set(OutOfMemory, 0, "curl", "internal"); ++env->stat.failed_requests; -- 2.17.1
next prev parent reply other threads:[~2019-10-28 15:52 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-28 15:51 [Tarantool-patches] [PATCH v3 0/4] http: add CURLOPT_ACCEPT_ENCODING option Ilya Kosarev 2019-10-28 15:51 ` [Tarantool-patches] [PATCH v3 1/4] " Ilya Kosarev 2019-10-28 15:51 ` Ilya Kosarev [this message] 2019-10-28 15:51 ` [Tarantool-patches] [PATCH v3 3/4] http: enrich httpc_request with curl error message buffer Ilya Kosarev 2019-10-28 15:51 ` [Tarantool-patches] [PATCH v3 4/4] http: add CURLE_BAD_CONTENT_ENCODING case for curl_request code Ilya Kosarev
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=026268b0080a542fa413a69dd07b18b8bc514960.1572276894.git.i.kosarev@tarantool.org \ --to=i.kosarev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [Tarantool-patches] [PATCH v3 2/4] http: remove redundant & incorrect case for curl_request code' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox