File mod_mono_1.2.5_p5_final.patch of Package apache2-mod_mono

Overview Repositories Revisions Requests Users Attributes Meta

File mod_mono_1.2.5_p5_final.patch of Package apache2-mod_mono (Revision d6a277221eb200a4802cb625670a9440)

Currently displaying revision d6a277221eb200a4802cb625670a9440 , Show latest

diff -ru p4/mod_mono-1.2.5/ChangeLog mod_mono-1.2.5/ChangeLog
--- p4/mod_mono-1.2.5/ChangeLog	2007-08-16 14:43:48.000000000 -0600
+++ mod_mono-1.2.5/ChangeLog	2007-08-22 10:37:29.000000000 -0600
@@ -1,3 +1,8 @@
+2007-08-22  Marek Habersack  <mhabersack@novell.com>
+
+	* src/mod_mono.c (terminate_xsp2): if apache is shutting down,
+	destroy the mutex too, to avoid a leak.
+
 2007-08-10  Marek Habersack  <mhabersack@novell.com>
 
 	* src/mod_mono.c (terminate_xsp2): take an extra argument telling
diff -ru p4/mod_mono-1.2.5/src/mod_mono.c mod_mono-1.2.5/src/mod_mono.c
--- p4/mod_mono-1.2.5/src/mod_mono.c	2007-08-16 14:43:48.000000000 -0600
+++ mod_mono-1.2.5/src/mod_mono.c	2007-08-22 10:37:29.000000000 -0600
@@ -2256,7 +2256,18 @@
 			xsp->dashboard_shm = NULL;
 			xsp->dashboard = NULL;
 		}
-			
+
+		if (!for_restart && xsp->dashboard_mutex) {
+			DEBUG_PRINT (0, "Destroying dasboard mutex %s", xsp->dashboard_lock_file);
+			rv = apr_global_mutex_destroy (xsp->dashboard_mutex);
+			if (rv != APR_SUCCESS)
+				ap_log_error (APLOG_MARK, APLOG_WARNING, STATCODE_AND_SERVER (rv),
+					      "Failed to destroy the dashboard mutex '%s'",
+					      xsp->dashboard_lock_file);
+			else
+				xsp->dashboard_mutex = NULL;
+		}
+		
 		xsp->status = FORK_NONE;
 	}
 
@@ -2267,6 +2278,7 @@
 static apr_status_t
 terminate_xsp (void *data)
 {
+	DEBUG_PRINT (0, "Cleaning up for shutdown");
 	return terminate_xsp2(data, NULL, 0, 0);
 }

Places

File mod_mono_1.2.5_p5_final.patch of Package apache2-mod_mono (Revision d6a277221eb200a4802cb625670a9440)

Places