[Python-modules-commits] r25484 - in packages/mod-wsgi/trunk/debian (3 files)

[fgeyer at users.alioth.debian.org]

    Date: Saturday, August 10, 2013 @ 16:00:32
  Author: fgeyer
Revision: 25484

* Fix wsgi applications segfaulting when run in daemon mode under Apache 2.4.
  Thanks to Stephan Adig. (Closes: #719304)
  - Add fix_crash_daemon_mode.patch, cherry-picked from upstream.

Added:
  packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch
Modified:
  packages/mod-wsgi/trunk/debian/changelog
  packages/mod-wsgi/trunk/debian/patches/series

Modified: packages/mod-wsgi/trunk/debian/changelog
===================================================================
--- packages/mod-wsgi/trunk/debian/changelog	2013-08-10 12:50:00 UTC (rev 25483)
+++ packages/mod-wsgi/trunk/debian/changelog	2013-08-10 16:00:32 UTC (rev 25484)
@@ -1,3 +1,11 @@
+mod-wsgi (3.4-4) UNRELEASED; urgency=low
+
+  * Fix wsgi applications segfaulting when run in daemon mode under Apache 2.4.
+    Thanks to Stephan Adig. (Closes: #719304)
+    - Add fix_crash_daemon_mode.patch, cherry-picked from upstream.
+
+ -- Felix Geyer <fgeyer at debian.org>  Sat, 10 Aug 2013 17:28:26 +0200
+
 mod-wsgi (3.4-3) unstable; urgency=low
 
   * Upload to unstable (python3 build dependency removed)

Added: packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch	                        (rev 0)
+++ packages/mod-wsgi/trunk/debian/patches/fix_crash_daemon_mode.patch	2013-08-10 16:00:32 UTC (rev 25484)
@@ -0,0 +1,21 @@
+Description: Scoreboard handle in daemon mode should be set to NULL for
+ Apache 2.4 to avoid crash in lingering close.
+Origin: upstream, https://code.google.com/p/modwsgi/source/detail?r=20979c8abd2f722d210d419b96c85e46a36e2d75
+Bug-Debian: http://bugs.debian.org/719304
+
+--- a/mod_wsgi.c
++++ b/mod_wsgi.c
+@@ -10599,7 +10599,13 @@
+      * will add their own input/output filters to the chain.
+      */
+ 
++#if AP_MODULE_MAGIC_AT_LEAST(20110619,0)
++    /* For 2.4 a NULL sbh pointer should work. */
++    sbh = NULL;
++#else
++    /* For 2.2 a dummy sbh pointer is needed. */
+     ap_create_sb_handle(&sbh, p, -1, 0);
++#endif
+ 
+     c = (conn_rec *)apr_pcalloc(p, sizeof(conn_rec));
+ 

Modified: packages/mod-wsgi/trunk/debian/patches/series
===================================================================
--- packages/mod-wsgi/trunk/debian/patches/series	2013-08-10 12:50:00 UTC (rev 25483)
+++ packages/mod-wsgi/trunk/debian/patches/series	2013-08-10 16:00:32 UTC (rev 25484)
@@ -1 +1,2 @@
 python-config.patch
+fix_crash_daemon_mode.patch