[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1633440bd553d789372b22428477fa2d0088e10f)

Vlad Glagolev scm at sourcemage.org
Tue Sep 30 07:14:47 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 http/lighttpd/HISTORY       |    3 ++-
 http/lighttpd/PRE_BUILD     |    4 ++++
 http/lighttpd/fastcgi.patch |   27 +++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 1633440bd553d789372b22428477fa2d0088e10f
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    Revert of my revert.. proven as unfixed.. still..
    
    Revert "removed useless patch: this issue is already fixed (by adding fix-root-scriptname env var in config) :)"
    
    This reverts commit 207450bf819a4c3eae13a34651c766841ecb4d69.

diff --git a/http/lighttpd/HISTORY b/http/lighttpd/HISTORY
index 4c94fbd..97e9d72 100644
--- a/http/lighttpd/HISTORY
+++ b/http/lighttpd/HISTORY
@@ -1,7 +1,8 @@
 2008-09-30 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.4.20; switched to bzipped2 tarball
-	* PRE_BUILD: removed; everything's fixed by upstream
+	* PRE_BUILD: everything's fixed by upstream, backported fastcgi patch
 	* memory.leak.patch, mod_fastcgi.patch, mod_scgi.patch: removed
+	* fastcgi.patch: added
 
 2008-09-29 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: SECURITY_PATCH+=1 (http://secunia.com/advisories/32069/);
diff --git a/http/lighttpd/PRE_BUILD b/http/lighttpd/PRE_BUILD
new file mode 100755
index 0000000..ffc84c4
--- /dev/null
+++ b/http/lighttpd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/fastcgi.patch"
diff --git a/http/lighttpd/fastcgi.patch b/http/lighttpd/fastcgi.patch
new file mode 100644
index 0000000..2f235ec
--- /dev/null
+++ b/http/lighttpd/fastcgi.patch
@@ -0,0 +1,27 @@
+--- src/mod_fastcgi.c.orig	Fri Mar  7 13:48:34 2008
++++ src/mod_fastcgi.c	Mon Sep 29 22:49:07 2008
+@@ -3581,13 +3581,22 @@ static handler_t fcgi_check_extension(server *srv, con
+ 			 *
+ 			 * SCRIPT_NAME = /fcgi-bin/foo
+ 			 * PATH_INFO   = /bar
++                         *
++                         * if prefix = /
++                         *
++                         * /foo/bar
++                         *
++                         * SCRIPT_NAME = 
++                         * PATH_INFO = /foo/bar
+ 			 *
+ 			 */
+ 
+ 			/* the rewrite is only done for /prefix/? matches */
+ 			if (extension->key->ptr[0] == '/' &&
+-			    con->uri.path->used > extension->key->used &&
+-			    NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))) {
++                            /* Special case for "/" */
++                            ((extension->key->ptr[1] == '\0' && (pathinfo = con->uri.path->ptr))
++                            || (con->uri.path->used > extension->key->used &&
++			        NULL != (pathinfo = strchr(con->uri.path->ptr + extension->key->used - 1, '/'))))) {
+ 				/* rewrite uri.path and pathinfo */
+ 
+ 				buffer_copy_string(con->request.pathinfo, pathinfo);



More information about the SM-Commit mailing list