Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit apache2-mod_mono
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 31 Aug 2007 15:35:28 +0200
  • Message-id: <20070831133528.AB77C678331@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package apache2-mod_mono
checked in at Fri Aug 31 15:35:28 CEST 2007.

--------
--- apache2-mod_mono/apache2-mod_mono.changes   2007-08-17 18:03:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/apache2-mod_mono/apache2-mod_mono.changes      2007-08-31 05:46:48.111280000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 31 05:46:28 CEST 2007 - wberrier@xxxxxxx
+
+- mod_mono_1.2.5_p5_final.patch: fix regression: avoid sem leak
+
+-------------------------------------------------------------------

New:
----
  mod_mono_1.2.5_p5_final.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apache2-mod_mono.spec ++++++
--- /var/tmp/diff_new_pack.j12129/_old  2007-08-31 15:34:05.000000000 +0200
+++ /var/tmp/diff_new_pack.j12129/_new  2007-08-31 15:34:05.000000000 +0200
@@ -21,10 +21,11 @@
 Group:          Productivity/Networking/Web/Servers
 Autoreqprov:    on
 Version:        1.2.5
-Release:        7
+Release:        12
 Summary:        Run ASP.NET Pages on Unix with Apache and Mono
 Source:         %{modname}-%{version}.tar.bz2
 Patch0:         mod_mono_1.2.5_p4.patch.bz2
+Patch1:         mod_mono_1.2.5_p5_final.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       mod_mono = %{version}-%{release}
 Requires:       xsp
@@ -55,6 +56,7 @@
 %prep
 %setup -n %{modname}-%{version} -q
 %patch0
+%patch1 -p1
 
 %build
 autoreconf -fi
@@ -74,6 +76,8 @@
 %{_mandir}/man8/mod_mono.8*
 
 %changelog
+* Fri Aug 31 2007 - wberrier@xxxxxxx
+- mod_mono_1.2.5_p5_final.patch: fix regression: avoid sem leak
 * Fri Aug 17 2007 - wberrier@xxxxxxx
 - put mod_mono.conf in /etc/apache2/conf.d instead of /etc/apache2
 - mod_mono_1.2.5_p4.patch.bz2: Bugfixes found in 1.2.5

++++++ mod_mono_1.2.5_p5_final.patch ++++++
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@xxxxxxxxxx>
+
+       * 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@xxxxxxxxxx>
 
        * 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);
 }
 

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread