summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-04-05 17:07:16 +1000
committerRobert Ancell <robert.ancell@canonical.com>2012-04-05 17:07:16 +1000
commit471d1c90a23695ac6d21c1585d044cedabc6c1a3 (patch)
tree489991f25b9659299430af9bdda6d87db8b406ae
parent4dcbad9c8b4f1715237ce6b8761c32d6409e47d8 (diff)
downloadlightdm-git-471d1c90a23695ac6d21c1585d044cedabc6c1a3.tar.gz
Change XDMCP manage timeout from 10ms to 126s (maximum specified in the XDMP specification)
-rw-r--r--NEWS5
-rw-r--r--src/xdmcp-server.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 335fdf00..aaa4abdc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Overview of changes in lightdm 1.0.11
+
+ * Change XDMCP manage timeout from 10ms to 126s (maximum specified in the
+ XDMCP specification)
+
Overview of changes in lightdm 1.0.10
* Fix compilation failure in liblightdm-qt with GCC 4.7
diff --git a/src/xdmcp-server.c b/src/xdmcp-server.c
index ce475bbc..59a38a65 100644
--- a/src/xdmcp-server.c
+++ b/src/xdmcp-server.c
@@ -51,6 +51,9 @@ struct XDMCPServerPrivate
G_DEFINE_TYPE (XDMCPServer, xdmcp_server, G_TYPE_OBJECT);
+/* Maximum number of milliseconds client will resend manage requests before giving up */
+#define MANAGE_TIMEOUT 126000
+
XDMCPServer *
xdmcp_server_new (void)
{
@@ -133,7 +136,7 @@ add_session (XDMCPServer *server)
session = xdmcp_session_new (id);
session->priv->server = server;
g_hash_table_insert (server->priv->sessions, GINT_TO_POINTER ((gint) id), g_object_ref (session));
- session->priv->inactive_timeout = g_timeout_add (10, (GSourceFunc) session_timeout_cb, session);
+ session->priv->inactive_timeout = g_timeout_add (MANAGE_TIMEOUT, (GSourceFunc) session_timeout_cb, session);
return session;
}