diff options
author | Steve Holme <steve_holme@hotmail.com> | 2019-05-13 21:42:35 +0100 |
---|---|---|
committer | Steve Holme <steve_holme@hotmail.com> | 2019-05-15 00:32:42 +0100 |
commit | e832d1ef74f260146cdab59cbac1d6969836663a (patch) | |
tree | 2b06c75083bc17ab2cb274c7bae9feedf44fdfad /lib/http.c | |
parent | 85bef18ca1afc356df3bb28e27ac74e4332affa1 (diff) | |
download | curl-e832d1ef74f260146cdab59cbac1d6969836663a.tar.gz |
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
Diffstat (limited to 'lib/http.c')
-rw-r--r-- | lib/http.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/http.c b/lib/http.c index 75d59ca90..222f7f53d 100644 --- a/lib/http.c +++ b/lib/http.c @@ -494,8 +494,8 @@ static CURLcode http_perhapsrewind(struct connectdata *conn) if((data->state.authproxy.picked == CURLAUTH_NEGOTIATE) || (data->state.authhost.picked == CURLAUTH_NEGOTIATE)) { if(((expectsend - bytessent) < 2000) || - (conn->negotiate.state != GSS_AUTHNONE) || - (conn->proxyneg.state != GSS_AUTHNONE)) { + (conn->http_negotiate_state != GSS_AUTHNONE) || + (conn->proxy_negotiate_state != GSS_AUTHNONE)) { /* The NEGOTIATE-negotiation has started *OR* there is just a little (<2K) data left to send, keep on sending. */ @@ -840,8 +840,8 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, struct Curl_easy *data = conn->data; #ifdef USE_SPNEGO - struct negotiatedata *negdata = proxy? - &conn->proxyneg:&conn->negotiate; + curlnegotiate *negstate = proxy ? &conn->proxy_negotiate_state : + &conn->http_negotiate_state; #endif unsigned long *availp; struct auth *authp; @@ -888,7 +888,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, return CURLE_OUT_OF_MEMORY; data->state.authproblem = FALSE; /* we received a GSS auth token and we dealt with it fine */ - negdata->state = GSS_AUTHRECV; + *negstate = GSS_AUTHRECV; } else data->state.authproblem = TRUE; @@ -3432,19 +3432,19 @@ CURLcode Curl_http_readwrite_headers(struct Curl_easy *data, #if defined(USE_SPNEGO) if(conn->bits.close && (((data->req.httpcode == 401) && - (conn->negotiate.state == GSS_AUTHRECV)) || + (conn->http_negotiate_state == GSS_AUTHRECV)) || ((data->req.httpcode == 407) && - (conn->proxyneg.state == GSS_AUTHRECV)))) { + (conn->proxy_negotiate_state == GSS_AUTHRECV)))) { infof(data, "Connection closure while negotiating auth (HTTP 1.0?)\n"); data->state.authproblem = TRUE; } - if((conn->negotiate.state == GSS_AUTHDONE) && + if((conn->http_negotiate_state == GSS_AUTHDONE) && (data->req.httpcode != 401)) { - conn->negotiate.state = GSS_AUTHSUCC; + conn->http_negotiate_state = GSS_AUTHSUCC; } - if((conn->proxyneg.state == GSS_AUTHDONE) && + if((conn->proxy_negotiate_state == GSS_AUTHDONE) && (data->req.httpcode != 407)) { - conn->proxyneg.state = GSS_AUTHSUCC; + conn->proxy_negotiate_state = GSS_AUTHSUCC; } #endif /* |