diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-14 15:51:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 15:51:44 +0000 |
| commit | 9aa1a64cabedcc41f8be6608e0ee872b56c454a3 (patch) | |
| tree | 2c3eab943845aec3b36d6ea0e33ce0f5cc412033 /lib/vtls/bearssl.c | |
| parent | 0c66739b05f29c81b6a0a6814929e1e6a51c6995 (diff) | |
| parent | d82935bad8787715114b546d997bc3e494fb63cc (diff) | |
| download | external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.gz external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.bz2 external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.zip | |
Merge "Upgrade curl to curl-7_71_1" am: 23abcba889 am: d82935bad8
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1360986
Change-Id: If39a57f7925d048081295b1d981399e38ac55e22
Diffstat (limited to 'lib/vtls/bearssl.c')
| -rw-r--r-- | lib/vtls/bearssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c index 1a6530c8..628e16a1 100644 --- a/lib/vtls/bearssl.c +++ b/lib/vtls/bearssl.c @@ -642,7 +642,7 @@ static CURLcode bearssl_connect_common(struct connectdata *conn, struct Curl_easy *data = conn->data; struct ssl_connect_data *connssl = &conn->ssl[sockindex]; curl_socket_t sockfd = conn->sock[sockindex]; - time_t timeout_ms; + timediff_t timeout_ms; int what; /* check if the connection has already been established */ |