[Python-modules-commits] r3021 - in /packages/mod-wsgi/trunk/debian: changelog control patches/00list patches/configure-apache-version.dpatch patches/makefile-destdir.dpatch patches/r413-error-log-fix.dpatch patches/umask-fix.dpatch watch
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Sun Aug 12 10:57:39 UTC 2007
Author: bzed-guest
Date: Sun Aug 12 10:57:39 2007
New Revision: 3021
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3021
Log:
- new usptream version
- crash fix backport from svn
Added:
packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch (with props)
Removed:
packages/mod-wsgi/trunk/debian/patches/makefile-destdir.dpatch
packages/mod-wsgi/trunk/debian/patches/umask-fix.dpatch
Modified:
packages/mod-wsgi/trunk/debian/changelog
packages/mod-wsgi/trunk/debian/control
packages/mod-wsgi/trunk/debian/patches/00list
packages/mod-wsgi/trunk/debian/patches/configure-apache-version.dpatch
packages/mod-wsgi/trunk/debian/watch
Modified: packages/mod-wsgi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/changelog?rev=3021&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/changelog (original)
+++ packages/mod-wsgi/trunk/debian/changelog Sun Aug 12 10:57:39 2007
@@ -1,11 +1,19 @@
-mod-wsgi (1.0~c1-3) UNRELEASED; urgency=low
+mod-wsgi (1.0~c2-1) unstable; urgency=low
+ * New upstream version
* debian/control:
- - removing autotools-dev build-dep, as configure relies on the information
- provided by apxs2 completely and does not take care of config.sub or
- config.guess.
+ - Removing autotools-dev build-dep, as configure relies on the information
+ provided by apxs2 and does not take care of config.sub or config.guess.
+ * debian/watch:
+ - Fixing filenamemangle to allow uscan to download the file
+ * debian/patches/makefile-destdir.dpatch,umask-fix.dpatch:
+ - Removing files, changes were added upstream
+ * debian/patches/r413-error-log-fix.dpatch:
+ - Adding patch from upstream's svn to fix a bug which could result in a
+ crash of mod-wsgi, for details see
+ http://code.google.com/p/modwsgi/issues/detail?id=24
- -- Bernd Zeimetz <bernd at bzed.de> Wed, 01 Aug 2007 02:21:25 +0200
+ -- Bernd Zeimetz <bernd at bzed.de> Sun, 12 Aug 2007 12:56:10 +0200
mod-wsgi (1.0~c1-2) unstable; urgency=low
Modified: packages/mod-wsgi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/control?rev=3021&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/control (original)
+++ packages/mod-wsgi/trunk/debian/control Sun Aug 12 10:57:39 2007
@@ -19,4 +19,4 @@
based web applications within Apache. The adapter provides significantly
better performance than using existing WSGI adapters for mod_python or CGI.
.
- Homepage: http://code.google.com/p/modwsgi/
+ Homepage: http://www.modwsgi.org/
Modified: packages/mod-wsgi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/00list?rev=3021&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/00list (original)
+++ packages/mod-wsgi/trunk/debian/patches/00list Sun Aug 12 10:57:39 2007
@@ -1,3 +1,2 @@
-makefile-destdir
configure-apache-version
-umask-fix
+r413-error-log-fix
Modified: packages/mod-wsgi/trunk/debian/patches/configure-apache-version.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/configure-apache-version.dpatch?rev=3021&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/configure-apache-version.dpatch (original)
+++ packages/mod-wsgi/trunk/debian/patches/configure-apache-version.dpatch Sun Aug 12 10:57:39 2007
@@ -5,9 +5,9 @@
@DPATCH@
diff -urNad mod-wsgi~/configure mod-wsgi/configure
---- mod-wsgi~/configure 2007-06-23 06:05:48.000000000 +0200
-+++ mod-wsgi/configure 2007-07-30 21:44:01.000000000 +0200
-@@ -1385,14 +1385,16 @@
+--- mod-wsgi~/configure 2007-07-31 14:13:08.000000000 +0200
++++ mod-wsgi/configure 2007-08-12 12:55:24.000000000 +0200
+@@ -1385,17 +1385,18 @@
@@ -23,7 +23,9 @@
+#HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
+#echo "$as_me:$LINENO: result: $HTTPD_VERSION" >&5
+#echo "${ECHO_T}$HTTPD_VERSION" >&6
-+#
+
+ LIBEXECDIR="`${APXS} -q LIBEXECDIR`"
+
+#HTTPD_MAJOR_VERSION=`echo ${HTTPD_VERSION} | sed -e 's/\..*//'`
-HTTPD_MAJOR_VERSION=`echo ${HTTPD_VERSION} | sed -e 's/\..*//'`
Added: packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch?rev=3021&op=file
==============================================================================
--- packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch (added)
+++ packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch Sun Aug 12 10:57:39 2007
@@ -1,0 +1,96 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## r413-error-log-fix.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: fixing bug described in
+## DP: http://code.google.com/p/modwsgi/issues/detail?id=24
+
+ at DPATCH@
+diff -urNad mod-wsgi~/mod_wsgi.c mod-wsgi/mod_wsgi.c
+--- mod-wsgi~/mod_wsgi.c 2007-08-10 12:12:02.000000000 +0200
++++ mod-wsgi/mod_wsgi.c 2007-08-12 12:45:26.000000000 +0200
+@@ -195,7 +195,7 @@
+
+ #define MOD_WSGI_MAJORVERSION_NUMBER 1
+ #define MOD_WSGI_MINORVERSION_NUMBER 0
+-#define MOD_WSGI_VERSION_STRING "1.0c2"
++#define MOD_WSGI_VERSION_STRING "1.0c3-TRUNK"
+
+ #if AP_SERVER_MAJORVERSION_NUMBER < 2
+ module MODULE_VAR_EXPORT wsgi_module;
+@@ -817,17 +817,19 @@
+ static void Log_dealloc(LogObject *self)
+ {
+ if (self->s) {
+- if (self->r) {
+- Py_BEGIN_ALLOW_THREADS
+- ap_log_rerror(APLOG_MARK, WSGI_LOG_LEVEL(self->level),
+- self->r, "%s", self->s);
+- Py_END_ALLOW_THREADS
+- }
+- else {
+- Py_BEGIN_ALLOW_THREADS
+- ap_log_error(APLOG_MARK, WSGI_LOG_LEVEL(self->level),
+- wsgi_server, "%s", self->s);
+- Py_END_ALLOW_THREADS
++ if (!self->expired) {
++ if (self->r) {
++ Py_BEGIN_ALLOW_THREADS
++ ap_log_rerror(APLOG_MARK, WSGI_LOG_LEVEL(self->level),
++ self->r, "%s", self->s);
++ Py_END_ALLOW_THREADS
++ }
++ else {
++ Py_BEGIN_ALLOW_THREADS
++ ap_log_error(APLOG_MARK, WSGI_LOG_LEVEL(self->level),
++ wsgi_server, "%s", self->s);
++ Py_END_ALLOW_THREADS
++ }
+ }
+
+ free(self->s);
+@@ -3661,10 +3663,12 @@
+ AdapterObject *adapter = NULL;
+ adapter = newAdapterObject(r);
+
+- Py_INCREF(object);
+-
+ if (adapter) {
++ PyObject *args = NULL;
++
++ Py_INCREF(object);
+ status = Adapter_run(adapter, object);
++ Py_DECREF(object);
+
+ /*
+ * Wipe out references to Apache request object
+@@ -3676,6 +3680,21 @@
+
+ adapter->r = NULL;
+ adapter->input->r = NULL;
++
++ /*
++ * Flush any data held within error log object
++ * and mark it as expired so that it can't be
++ * used beyond life of the request. We hope that
++ * this doesn't error, as it will overwrite any
++ * error from application if it does.
++ */
++
++ args = PyTuple_New(0);
++ object = Log_flush(adapter->log, args);
++ Py_XDECREF(object);
++ Py_DECREF(args);
++
++ adapter->log->r = NULL;
+ adapter->log->expired = 1;
+
+ #if defined(MOD_WSGI_WITH_BUCKETS)
+@@ -3684,8 +3703,6 @@
+ }
+
+ Py_XDECREF((PyObject *)adapter);
+-
+- Py_DECREF(object);
+ }
+ else {
+ Py_BEGIN_ALLOW_THREADS
Propchange: packages/mod-wsgi/trunk/debian/patches/r413-error-log-fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/mod-wsgi/trunk/debian/watch
URL: http://svn.debian.org/wsvn/python-modules/packages/mod-wsgi/trunk/debian/watch?rev=3021&op=diff
==============================================================================
--- packages/mod-wsgi/trunk/debian/watch (original)
+++ packages/mod-wsgi/trunk/debian/watch Sun Aug 12 10:57:39 2007
@@ -1,4 +1,4 @@
version=3
-opts="filenamemangle=s/_/-/,uversionmangle=s/([0-9.]*)(.*)/$1~$2/" \
-http://code.google.com/p/modwsgi/downloads/list http://modwsgi.googlecode.com/files/mod_wsgi-(.*)\.tar\.gz
+opts="filenamemangle=s/.*\/mod_wsgi/mod-wsgi/,uversionmangle=s/([0-9.]*)(.*)/$1~$2/" \
+http://code.google.com/p/modwsgi/downloads/list http://modwsgi.googlecode.com/files/mod_wsgi-(.*)\.tar\.gz debian uupdate
More information about the Python-modules-commits
mailing list