aboutsummaryrefslogtreecommitdiff
path: root/src/microspdy/daemon.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-06-27 14:41:35 +0000
committerChristian Grothoff <christian@grothoff.org>2013-06-27 14:41:35 +0000
commitfe8202d39c32032b68a7a6760651c843b2e3e16d (patch)
treecc92301b6c92767d65912c24d5b9accb4361efc1 /src/microspdy/daemon.c
parent79f2eea2629367ca402671cf7d033e52de0f9e8a (diff)
downloadlibmicrohttpd-fe8202d39c32032b68a7a6760651c843b2e3e16d.tar.gz
libmicrohttpd-fe8202d39c32032b68a7a6760651c843b2e3e16d.zip
-fixing misc minor bugs and compiler warnings in libmicrospdy
Diffstat (limited to 'src/microspdy/daemon.c')
-rw-r--r--src/microspdy/daemon.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/microspdy/daemon.c b/src/microspdy/daemon.c
index 47e49ea1..09cf2107 100644
--- a/src/microspdy/daemon.c
+++ b/src/microspdy/daemon.c
@@ -423,15 +423,15 @@ SPDYF_get_fdset (struct SPDY_Daemon *daemon,
423 { 423 {
424 fd = pos->socket_fd; 424 fd = pos->socket_fd;
425 FD_SET(fd, read_fd_set); 425 FD_SET(fd, read_fd_set);
426 if(all 426 if (all
427 || NULL != pos->response_queue_head //frames pending 427 || (NULL != pos->response_queue_head) //frames pending
428 || NULL != pos->write_buffer //part of last frame pending 428 || (NULL != pos->write_buffer) //part of last frame pending
429 || SPDY_SESSION_STATUS_CLOSING == pos->status //the session is about to be closed 429 || (SPDY_SESSION_STATUS_CLOSING == pos->status) //the session is about to be closed
430 || daemon->session_timeout //timeout passed for the session 430 || (daemon->session_timeout //timeout passed for the session
431 && (pos->last_activity + daemon->session_timeout < SPDYF_monotonic_time()) 431 && (pos->last_activity + daemon->session_timeout < SPDYF_monotonic_time()))
432 || SPDY_YES == SPDYF_tls_is_pending(pos) //data in TLS' read buffer pending 432 || (SPDY_YES == SPDYF_tls_is_pending(pos)) //data in TLS' read buffer pending
433 || ((pos->read_buffer_offset - pos->read_buffer_beginning) > 0) // data in lib's read buffer pending 433 || ((pos->read_buffer_offset - pos->read_buffer_beginning) > 0) // data in lib's read buffer pending
434 ) 434 )
435 FD_SET(fd, write_fd_set); 435 FD_SET(fd, write_fd_set);
436 if(fd > max_fd) 436 if(fd > max_fd)
437 max_fd = fd; 437 max_fd = fd;