Browse Source

Check regularly for an invalidated file handle in read_socket_line

master
Con Kolivas 9 years ago
parent
commit
52b3a28b88
  1. 8
      src/ckpool.c

8
src/ckpool.c

@ -560,9 +560,6 @@ int read_socket_line(connsock_t *cs, float *timeout)
int ret = -1; int ret = -1;
float diff; float diff;
if (unlikely(cs->fd < 0))
goto out;
clear_bufline(cs); clear_bufline(cs);
eom = strchr(cs->buf, '\n'); eom = strchr(cs->buf, '\n');
@ -571,6 +568,11 @@ int read_socket_line(connsock_t *cs, float *timeout)
while (!eom) { while (!eom) {
char readbuf[PAGESIZE]; char readbuf[PAGESIZE];
if (unlikely(cs->fd < 0)) {
ret = -1;
goto out;
}
if (*timeout < 0) { if (*timeout < 0) {
if (cs->ckp->proxy) if (cs->ckp->proxy)
LOGINFO("Timed out in read_socket_line"); LOGINFO("Timed out in read_socket_line");

Loading…
Cancel
Save