- new from debian

[packages/apache1-mod_fastcgi.git] / apache1-mod_fastcgi-segv-onload.patch

--- libapache-mod-fastcgi-2.4.2.orig/debian/patches/apache2-segv-on-load.dpatch
+++ libapache-mod-fastcgi-2.4.2/debian/patches/apache2-segv-on-load.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apache2-segv-on-load.dpatch by  <sugi@nemui.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad libapache-mod-fastcgi~/mod_fastcgi.c libapache-mod-fastcgi/mod_fastcgi.c
+--- libapache-mod-fastcgi~/mod_fastcgi.c	2005-08-06 14:09:11.000000000 +0900
++++ libapache-mod-fastcgi/mod_fastcgi.c	2006-10-06 20:52:46.368480801 +0900
+@@ -2850,10 +2850,15 @@
+ 
+     get_request_identity(r, &uid, &gid);
+ 
+-    if (fcgi_util_fs_get_by_id(r->filename, uid, gid))
++    /* Only try this if r->filename is not NULL,
++     * otherwise Apache 2 crashes with SIGSEGV... */
++    if (r->filename)
+     {
+-        r->handler = FASTCGI_HANDLER_NAME;
+-        return OK;
++        if (fcgi_util_fs_get_by_id(r->filename, uid, gid))
++        {
++            r->handler = FASTCGI_HANDLER_NAME;
++            return OK;
++        }
+     }
+ 
+     return DECLINED;