aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/internal.h
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-04-05 23:21:59 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-04-05 23:21:59 +0300
commit8851d88e40a33bb942165c45d4e9d439038106a9 (patch)
treed102a6e22f3f7f81f12abc489e1358e2822665f1 /src/microhttpd/internal.h
parent076cbfbe0b1fb1535d2718f9cfc0d839a44d691e (diff)
downloadlibmicrohttpd-8851d88e40a33bb942165c45d4e9d439038106a9.tar.gz
libmicrohttpd-8851d88e40a33bb942165c45d4e9d439038106a9.zip
Fixed hypothetical situation when timeout could be larger than possible to measure.
Fixed detecting real closest timeout deadline when value wraps upper limit. Fixed compiler warnings.
Diffstat (limited to 'src/microhttpd/internal.h')
-rw-r--r--src/microhttpd/internal.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 1b9df892..9ced47c1 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -789,7 +789,12 @@ struct MHD_Connection
789 * After how many seconds of inactivity should 789 * After how many seconds of inactivity should
790 * this connection time out? Zero for no timeout. 790 * this connection time out? Zero for no timeout.
791 */ 791 */
792 unsigned int connection_timeout; 792 time_t connection_timeout;
793
794 /**
795 * Special member to be returned by #MHD_get_connection_info()
796 */
797 unsigned int connection_timeout_dummy;
793 798
794 /** 799 /**
795 * Did we ever call the "default_handler" on this connection? (this 800 * Did we ever call the "default_handler" on this connection? (this
@@ -1517,7 +1522,7 @@ struct MHD_Daemon
1517 * After how many seconds of inactivity should 1522 * After how many seconds of inactivity should
1518 * connections time out? Zero for no timeout. 1523 * connections time out? Zero for no timeout.
1519 */ 1524 */
1520 unsigned int connection_timeout; 1525 time_t connection_timeout;
1521 1526
1522 /** 1527 /**
1523 * Maximum number of connections per IP, or 0 for 1528 * Maximum number of connections per IP, or 0 for