33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From a8063d1e74cd86d0bbabee87aa57e660a08aca62 Mon Sep 17 00:00:00 2001
|
|
From: Kamil Dudka <kdudka@redhat.com>
|
|
Date: Sun, 25 Dec 2011 22:37:24 +0100
|
|
Subject: [PATCH] transfer: avoid unnecessary timeout event when waiting for 100-continue
|
|
|
|
The commit 9dd85bc unintentionally changed the way we compute the time
|
|
spent waiting for 100-continue. In particular, when using a SSL client
|
|
certificate, the time spent by SSL handshake was included and could
|
|
cause the CURL_TIMEOUT_EXPECT_100 timeout to be mistakenly fired up.
|
|
|
|
Bug: https://bugzilla.redhat.com/767490
|
|
Reported by: Mamoru Tasaka
|
|
---
|
|
lib/transfer.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/lib/transfer.c b/lib/transfer.c
|
|
index e56fffd..3d82571 100644
|
|
--- a/lib/transfer.c
|
|
+++ b/lib/transfer.c
|
|
@@ -2364,7 +2364,7 @@ Curl_setup_transfer(
|
|
(data->state.proto.http->sending == HTTPSEND_BODY)) {
|
|
/* wait with write until we either got 100-continue or a timeout */
|
|
k->exp100 = EXP100_AWAITING_CONTINUE;
|
|
- k->start100 = k->start;
|
|
+ k->start100 = Curl_tvnow();
|
|
|
|
/* set a timeout for the multi interface */
|
|
Curl_expire(data, CURL_TIMEOUT_EXPECT_100);
|
|
--
|
|
1.7.1
|
|
|