From 65f549493aa4674e97e1a9ee9f6644aeab73d374 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 30 Sep 2011 15:57:34 +0000
Subject: [PATCH] fixing 1811

---
 ChangeLog                     | 3 +++
 src/daemon/connection_https.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c3020a4c..317200d4 100644
--- 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
index e68ecbbe..8abb9feb 100644
--- 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);