Commit 4bb85904 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

DRTVWR-418: Fix minor merge mistake.

There was a merge collision in multi.c's multi_runsingle() function at the
point where we have a local patch concerning bug 1420. The upstream change was
to change a Curl_done() call to multi_done(). Our patch called Curl_done() in
each clause of an 'if' statement; we changed both to multi_done(). However,
our patch also had a Curl_posttransfer() call; we overzealously changed that
to multi_posttransfer() too. But there is no such function. Change back to
Curl_posttransfer().
parent 95b375b0
......@@ -1401,11 +1401,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
if(data->easy_conn) {
infof(data, "Request timed out. Signal all requests on connection.\n");
data->easy_conn->bits.poisoned_1420 = TRUE;
multi_posttransfer(data); /* Curl_posttransfer(data); */
Curl_posttransfer(data);
multi_done(&data->easy_conn, result, FALSE);
} else {
(void)multi_done(&data->easy_conn, result, TRUE);
}
(void)multi_done(&data->easy_conn, result, TRUE);
}
/* Skip the statemachine and go directly to error handling section. */
goto statemachine_end;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment