mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-06 15:41:36 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: sock_raw: move calls to si_data_close upper

Browse Source 
Some users of si_data_close() need to have the fd still open,
so we must move the call before fd_delete().
This commit is contained in:
Willy Tarreau 2012-08-06 12:23:51 +02:00 committed by Willy Tarreau
parent 3788e4c874
commit 3438f5dce1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sock_raw.c
View File

@ -710,6 +710,7 @@ static void sock_raw_shutw(struct stream_interface *si)
/* we may have to close a pending connection, and mark the
* response buffer as shutr
*/
si_data_close(si);
fd_delete(si_fd(si));
/* fall through */
case SI_ST_CER:
@ -717,7 +718,6 @@ static void sock_raw_shutw(struct stream_interface *si)
case SI_ST_TAR:
si->state = SI_ST_DIS;
si_data_close(si);
if (si->release)
si->release(si);
default:
@ -748,11 +748,11 @@ static void sock_raw_shutr(struct stream_interface *si)
return;
if (si->ob->flags & BF_SHUTW) {
si_data_close(si);
fd_delete(si_fd(si));
si->state = SI_ST_DIS;
si->exp = TICK_ETERNITY;
si_data_close(si);
if (si->release)
si->release(si);
return;