[Python-modules-commits] r3486 - in /packages/mod-wsgi/branches/experimental/debian: changelog control patches/00list patches/ap_thread_stacksize.dpatch

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Tue Oct 30 21:17:30 2007
New Revision: 3486

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3486
Log:
* debian/control: reverting the change from -1
* debian/patches:
  - Adding ap_thread_stacksize.dpatch to allow us to build the module using
    apache-threaded-dev. In the rare case that somebody would like to
    configure the stack size of WSGIDaemonProcess, both ThreadStackSize and
    stack-size option need to be set due to this change.

Added:
    packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch   (with props)
Modified:
    packages/mod-wsgi/branches/experimental/debian/changelog
    packages/mod-wsgi/branches/experimental/debian/control
    packages/mod-wsgi/branches/experimental/debian/patches/00list

Modified: packages/mod-wsgi/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/branches/experimental/debian/changelog?rev=3486&op=diff
==============================================================================
--- packages/mod-wsgi/branches/experimental/debian/changelog (original)
+++ packages/mod-wsgi/branches/experimental/debian/changelog Tue Oct 30 21:17:30 2007
@@ -1,3 +1,14 @@
+mod-wsgi (2.0~c1-2) experimental; urgency=low
+
+  * debian/control: reverting the change from -1
+  * debian/patches:
+    - Adding ap_thread_stacksize.dpatch to allow us to build the module using
+      apache-threaded-dev. In the rare case that somebody would like to
+      configure the stack size of WSGIDaemonProcess, both ThreadStackSize and
+      stack-size option need to be set due to this change.
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Tue, 30 Oct 2007 22:11:50 +0100
+
 mod-wsgi (2.0~c1-1) experimental; urgency=low
 
   [ Bernd Zeimetz ]

Modified: packages/mod-wsgi/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/branches/experimental/debian/control?rev=3486&op=diff
==============================================================================
--- packages/mod-wsgi/branches/experimental/debian/control (original)
+++ packages/mod-wsgi/branches/experimental/debian/control Tue Oct 30 21:17:30 2007
@@ -11,8 +11,8 @@
 
 Package: libapache2-mod-wsgi
 Architecture: any
-Depends: apache2, apache2.2-common, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- apache2-mpm-worker | apache2-mpm-event
+Depends: apache2, apache2.2-common, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Suggests: apache2-mpm-worker | apache2-mpm-event
 Description: Python WSGI adapter module for Apache
  The mod_wsgi adapter is an Apache module that provides a WSGI (Web Server
  Gateway Interface, a standard interface between web server software and

Modified: packages/mod-wsgi/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/branches/experimental/debian/patches/00list?rev=3486&op=diff
==============================================================================
--- packages/mod-wsgi/branches/experimental/debian/patches/00list (original)
+++ packages/mod-wsgi/branches/experimental/debian/patches/00list Tue Oct 30 21:17:30 2007
@@ -1,1 +1,2 @@
 configure-apache-version
+ap_thread_stacksize

Added: packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch?rev=3486&op=file
==============================================================================
--- packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch (added)
+++ packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch Tue Oct 30 21:17:30 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ap_thread_stacksize.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: From <88e286470710301405h412392f8ldc3e882ba941a27b at mail.gmail.com>
+## DP: It is not critical. I was just trying to inherit stack size from
+## DP: ThreadStackSize directive. Just means that someone will need to set
+## DP: both ThreadStackSize and stack-size option to WSGIDaemonProcess. Since
+## DP: rare that this would required, not too concerned in dropping it if it
+## DP: causes problems.
+
+ at DPATCH@
+diff -urNad mod-wsgi-experimental~/mod_wsgi.c mod-wsgi-experimental/mod_wsgi.c
+--- mod-wsgi-experimental~/mod_wsgi.c	2007-10-29 23:57:53.000000000 +0100
++++ mod-wsgi-experimental/mod_wsgi.c	2007-10-30 22:15:29.000000000 +0100
+@@ -7063,13 +7063,6 @@
+     if (daemon->group->stack_size) {
+         apr_threadattr_stacksize_set(thread_attr, daemon->group->stack_size);
+     }
+-#if defined(AP_MPM_WANT_SET_STACKSIZE)
+-    else {
+-        if (ap_thread_stacksize != 0) {
+-            apr_threadattr_stacksize_set(thread_attr, ap_thread_stacksize);
+-        }
+-    }
+-#endif
+ 
+     /* Start inactivity thread if required. */
+ 

Propchange: packages/mod-wsgi/branches/experimental/debian/patches/ap_thread_stacksize.dpatch
------------------------------------------------------------------------------
    svn:executable = *