[arch-commits] Commit in mod_fastcgi/repos (3 files)

[Jan de Groot]

    Date: Sunday, September 20, 2009 @ 08:22:06
  Author: jgc
Revision: 52472

Merged revisions 51251,52471 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mod_fastcgi/trunk

........
  r51251 | dan | 2009-09-06 19:45:49 +0200 (Sun, 06 Sep 2009) | 1 line
  
  Add pkgdesc for module
........
  r52471 | jgc | 2009-09-20 14:21:32 +0200 (Sun, 20 Sep 2009) | 2 lines
  
  upgpkg: mod_fastcgi 2.4.6-2
      Add fix for FS#16134. Fixes redirects on our website
........

Added:
  mod_fastcgi/repos/extra-x86_64/lp381384.patch
    (from rev 52471, mod_fastcgi/trunk/lp381384.patch)
Modified:
  mod_fastcgi/repos/extra-x86_64/	(properties)
  mod_fastcgi/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   10 ++++++----
 lp381384.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)


Property changes on: mod_fastcgi/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mod_fastcgi/trunk:1-50963
   + /mod_fastcgi/trunk:1-52471

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-20 12:21:32 UTC (rev 52471)
+++ extra-x86_64/PKGBUILD	2009-09-20 12:22:06 UTC (rev 52472)
@@ -3,18 +3,20 @@
 
 pkgname=mod_fastcgi
 pkgver=2.4.6
-pkgrel=1
-pkgdesc=""
+pkgrel=2
+pkgdesc="Apache module to support the FastCGI protocol"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.fastcgi.com/"
 depends=('apache')
 options=('!libtool')
-source=(http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a21a613dd5dacf4c8ad88c8550294fed')
+source=(http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz
+        lp381384.patch)
+md5sums=('a21a613dd5dacf4c8ad88c8550294fed' '7dd09e6579cc9bf2f992bbd82d1d1537')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/lp381384.patch" || return 1
   cp Makefile.AP2 Makefile
   make top_dir=/usr/lib/httpd || return 1
   make top_dir=/usr/lib/httpd DESTDIR="${pkgdir}" install || return 1

Copied: mod_fastcgi/repos/extra-x86_64/lp381384.patch (from rev 52471, mod_fastcgi/trunk/lp381384.patch)
===================================================================
--- extra-x86_64/lp381384.patch	                        (rev 0)
+++ extra-x86_64/lp381384.patch	2009-09-20 12:22:06 UTC (rev 52472)
@@ -0,0 +1,34 @@
+References:
+http://thread.gmane.org/gmane.comp.web.fastcgi.devel/2613
+http://article.gmane.org/gmane.comp.web.fastcgi.devel/1167
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=509116
+https://bugs.launchpad.net/ubuntu/+source/libapache-mod-fastcgi/+bug/381384
+
+Patch extracted from the SNAP-0811090952 snapshot tarball.
+2009-05-28 Martin von Gagern
+
+diff -ru mod_fastcgi-2.4.6/CHANGES mod_fastcgi-2.4.6-lp381384/CHANGES
+--- mod_fastcgi-2.4.6/CHANGES	2007-11-13 13:26:35.000000000 +0100
++++ mod_fastcgi-2.4.6-lp381384/CHANGES	2009-05-28 21:02:31.000000000 +0200
+@@ -1,3 +1,6 @@
++ *) Don't let the Content-Length header propagate on errors or across
++    redirects.  [Artur Zaprzala <arturz ownmail.net>]
++
+ 2.4.6
+ 
+  *) Fix a bug I introduced in 2.4.4 that broke dynamic application
+diff -ru mod_fastcgi-2.4.6/mod_fastcgi.c mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c
+--- mod_fastcgi-2.4.6/mod_fastcgi.c	2007-11-13 00:00:10.000000000 +0100
++++ mod_fastcgi-2.4.6-lp381384/mod_fastcgi.c	2009-05-28 21:02:31.000000000 +0200
+@@ -753,6 +753,11 @@
+                 ap_table_set(r->headers_out, "Location", value);
+                 continue;
+             }
++            
++            if (strcasecmp(name, "Content-Length") == 0) {
++                ap_table_set(r->headers_out, name, value);
++            	continue;
++            }
+ 
+             /* If the script wants them merged, it can do it */
+             ap_table_add(r->err_headers_out, name, value);