* Backport the important part of r8717 to stable. I forgot I did this on Friday...

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index dee9b45499a5e46c5b4f77d928b9de7fd643e592..0617cce0a750a0622258352736915230c5acdb35 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -891,6 +891,9 @@ void PerformSessionHooks(int EventType)
 
        for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
+                       if (EventType == EVT_TIMER) {
+                               citthread_setspecific(MyConKey, NULL);  /* for every hook */
+                       }
                        (*fcn->h_function_pointer) ();
                }
        }