From e832d1ef74f260146cdab59cbac1d6969836663a Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Mon, 13 May 2019 21:42:35 +0100 Subject: http_negotiate: Move the Negotiate state out of the negotiatedata structure Given that this member variable is not used by the SASL based protocols there is no need to have it here. Closes #3882 --- lib/multi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/multi.c') diff --git a/lib/multi.c b/lib/multi.c index 39e521afd..d7970c7d5 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -592,8 +592,8 @@ static CURLcode multi_done(struct Curl_easy *data, conn->proxy_ntlm_state == NTLMSTATE_TYPE2) #endif #if defined(USE_SPNEGO) - && !(conn->negotiate.state == GSS_AUTHRECV || - conn->proxyneg.state == GSS_AUTHRECV) + && !(conn->http_negotiate_state == GSS_AUTHRECV || + conn->proxy_negotiate_state == GSS_AUTHRECV) #endif ) || conn->bits.close || (premature && !(conn->handler->flags & PROTOPT_STREAM))) { -- cgit v1.2.3