RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-26 07:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG: Revert "OPTIM: poll: restore polling after a poll/stop/want sequence"

Browse Source 
This reverts commit 1208266356.

It randomly breaks SSL. What happens is that if the SSL response is
read at once by the SSL stack and is partially delivered to the buffer,
then there's no way to read the next parts because we wait for some
polling first.

So we'll fix this after the polling rework.
This commit is contained in:
Willy Tarreau 2014-01-13 11:34:42 +01:00
parent 17edc81e7e
commit 8663105095
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/proto/fd.h
View File

@ -171,15 +171,7 @@ static inline void fd_ev_set(int fd, int dir)
*/
if (i & (FD_EV_ACTIVE << dir))
return; /* already in desired state */
/* If we're touching an FD which is still being polled, and was
* recently disabled, we re-enable polling in order not to perform
* a syscall dance and to avoid a missed speculative event.
*/
if ((((unsigned int)fdtab[fd].spec_e) >> 4) & (FD_EV_POLLED << dir))
fdtab[fd].spec_e ^= i ^ (FD_EV_POLLED << dir);
else
fdtab[fd].spec_e |= (FD_EV_ACTIVE << dir);
fdtab[fd].spec_e |= (FD_EV_ACTIVE << dir);
updt_fd(fd); /* need an update entry to change the state */
}