diff options
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/http.c b/lib/http.c index 08daab6dc..758ee50de 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1323,7 +1323,7 @@ CURLcode Curl_http_follow(struct Curl_easy *data, const char *newurl, data->info.wouldredirect = follow_url; if(reachedmax) { - failf(data, "Maximum (%ld) redirects followed", data->set.maxredirs); + failf(data, "Maximum (%d) redirects followed", data->set.maxredirs); return CURLE_TOO_MANY_REDIRECTS; } return CURLE_OK; @@ -1528,8 +1528,7 @@ CURLcode Curl_http_do_pollset(struct Curl_easy *data, struct easy_pollset *ps) { /* write mode */ - curl_socket_t sock = Curl_conn_get_socket(data, FIRSTSOCKET); - return Curl_pollset_add_out(data, ps, sock); + return Curl_pollset_add_out(data, ps, data->conn->sock[FIRSTSOCKET]); } /* @@ -2415,7 +2414,7 @@ static CURLcode http_req_complete(struct Curl_easy *data, out: if(!result) { /* setup variables for the upcoming transfer */ - Curl_xfer_setup1(data, CURL_XFER_SENDRECV, -1, TRUE); + Curl_xfer_setup_sendrecv(data, FIRSTSOCKET, -1); } return result; } @@ -2704,6 +2703,8 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) if(result) goto fail; info_version = "HTTP/2"; + /* There is no ALPN here, but the connection is now definitely h2 */ + conn->httpversion_seen = 20; } else info_version = "HTTP/1.x"; @@ -4785,7 +4786,7 @@ static CURLcode cr_exp100_read(struct Curl_easy *data, /* We are now waiting for a reply from the server or * a timeout on our side IFF the request has been fully sent. */ DEBUGF(infof(data, "cr_exp100_read, start AWAITING_CONTINUE, " - "timeout %ldms", data->set.expect_100_timeout)); + "timeout %dms", data->set.expect_100_timeout)); ctx->state = EXP100_AWAITING_CONTINUE; ctx->start = curlx_now(); Curl_expire(data, data->set.expect_100_timeout, EXPIRE_100_TIMEOUT); |