diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-05-13 20:58:39 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-05-15 00:31:45 +0100 |
| commit | 85bef18ca1afc356df3bb28e27ac74e4332affa1 (patch) | |
| tree | 7d16e10766c905e0f5a67bede4292d936ab9cf4d /lib/http.c | |
| parent | 0c73adfad3ef9ea2fe2a0ebf7eb0a78b5abb877c (diff) | |
http_ntlm: Move the NTLM state out of the ntlmdata structure
Given that this member variable is not used by the SASL based protocols
there is no need to have it here.
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/http.c b/lib/http.c index 11c2fa12c..75d59ca90 100644 --- a/lib/http.c +++ b/lib/http.c @@ -466,8 +466,8 @@ static CURLcode http_perhapsrewind(struct connectdata *conn) (data->state.authproxy.picked == CURLAUTH_NTLM_WB) || (data->state.authhost.picked == CURLAUTH_NTLM_WB)) { if(((expectsend - bytessent) < 2000) || - (conn->ntlm.state != NTLMSTATE_NONE) || - (conn->proxyntlm.state != NTLMSTATE_NONE)) { + (conn->http_ntlm_state != NTLMSTATE_NONE) || + (conn->proxy_ntlm_state != NTLMSTATE_NONE)) { /* The NTLM-negotiation has started *OR* there is just a little (<2K) data left to send, keep on sending. */ @@ -3422,9 +3422,9 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, #if defined(USE_NTLM) if(conn->bits.close && (((data->req.httpcode == 401) && - (conn->ntlm.state == NTLMSTATE_TYPE2)) || + (conn->http_ntlm_state == NTLMSTATE_TYPE2)) || ((data->req.httpcode == 407) && - (conn->proxyntlm.state == NTLMSTATE_TYPE2)))) { + (conn->proxy_ntlm_state == NTLMSTATE_TYPE2)))) { infof(data, "Connection closure while negotiating auth (HTTP 1.0?)\n"); data->state.authproblem = TRUE; } |