libmicrohttpd

commit 65f549493aa4674e97e1a9ee9f6644aeab73d374
parent fe7ed03a632fb960bef5b5ba5ea23b07c8c2d397
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri, 30 Sep 2011 15:57:34 +0000

fixing 1811

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/daemon/connection_https.c
 | 
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Sep 30 17:56:36 CEST 2011
+	Fixed MHD_CONNECTION_OPTION_TIMEOUT for HTTPS (#1811). -CG
+
 Wed Sep 28 08:37:55 CEST 2011
 	Releasing libmicrohttpd 0.9.15. -CG
 
diff --git a/src/daemon/connection_https.c b/src/daemon/connection_https.c
@@ -150,7 +150,7 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection)
   MHD_DLOG (connection->daemon, "%s: state: %s\n",
             __FUNCTION__, MHD_state_to_string (connection->state));
 #endif
-  timeout = connection->daemon->connection_timeout;
+  timeout = connection->connection_timeout;
   if ( (timeout != 0) && (time (NULL) - timeout > connection->last_activity))
     MHD_connection_close (connection,
 			  MHD_REQUEST_TERMINATED_TIMEOUT_REACHED);