RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-31 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: streams: Don't add CF_WRITE_ERROR if early data were rejected.

Browse Source 
In sess_update_st_con_tcp(), if we have an error on the stream_interface
because we tried to send early_data but failed, don't flag the request
channel as CF_WRITE_ERROR, or we will never reach the analyser that sends
back the 425 response.

This should be backported to 1.9.
This commit is contained in:
Olivier Houchard 2019-05-03 22:21:24 +02:00
parent 010941f876
commit f4bda993dd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stream.c
View File

@ -667,7 +667,13 @@ static int sess_update_st_con_tcp(struct stream *s)
*/
si->state = SI_ST_EST;
si->err_type = SI_ET_DATA_ERR;
req->flags |= CF_WRITE_ERROR;
/* Don't add CF_WRITE_ERROR if we're here because
* early data were rejected by the server, or
* http_wait_for_response() will never be called
* to send a 425.
*/
if (conn->err_code != CO_ER_SSL_EARLY_FAILED)
req->flags |= CF_WRITE_ERROR;
rep->flags |= CF_READ_ERROR;
return 1;
}