X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fwebserver.c;h=36c64a5f4155863c1dc82c815361cb49216de463;hp=3e453db140dce5f554920728323e409327020891;hb=63ab6ebd84d0143f75f3f188231586ac41479426;hpb=a8f179fae6aa788bdcda23775d839abe8ffb5aa6

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 3e453db14..36c64a5f4 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -873,6 +873,27 @@ int main(int argc, char **argv)
 }
 
 
+void ShutDownWebcit(void)
+{
+	DeleteHash(&ZoneHash);
+	free_zone_directory ();
+	icaltimezone_release_zone_tab ();
+	icalmemory_free_ring ();
+	ShutDownLibCitadel ();
+	DeleteHash(&HandlerHash);
+	DeleteHash(&PreferenceHooks);
+	DeleteHash(&GlobalNS);
+	DeleteHash(&WirelessTemplateCache);
+	DeleteHash(&WirelessLocalTemplateCache);
+	DeleteHash(&TemplateCache);
+	DeleteHash(&LocalTemplateCache);
+	DeleteHash(&Iterators);
+	DeleteHash(&Contitionals);
+#ifdef ENABLE_NLS
+	ShutdownLocale();
+#endif
+}
+
 /*
  * Entry point for worker threads
  */
@@ -940,22 +961,9 @@ void worker_entry(void)
 				lprintf(2, "master shutdown: cleaning up sessions\n");
 				do_housekeeping();
 				lprintf(2, "master shutdown: cleaning up libical\n");
-				free_zone_directory ();
-				icaltimezone_release_zone_tab ();
-				icalmemory_free_ring ();
-				ShutDownLibCitadel ();
-				DeleteHash(&HandlerHash);
-				DeleteHash(&PreferenceHooks);
-				DeleteHash(&GlobalNS);
-				DeleteHash(&WirelessTemplateCache);
-				DeleteHash(&WirelessLocalTemplateCache);
-				DeleteHash(&TemplateCache);
-				DeleteHash(&LocalTemplateCache);
-				DeleteHash(&Iterators);
-				DeleteHash(&Contitionals);
-#ifdef ENABLE_NLS
-				void ShutdownLocale(void);
-#endif
+
+				ShutDownWebcit();
+
 				lprintf(2, "master shutdown exiting!.\n");				
 				exit(0);
 			}