SOURCES: lighttpd-use_bin_sh.patch (NEW) - patch is back: always u...

[glen]

Author: glen                         Date: Tue Sep 19 12:36:07 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patch is back: always use /bin/sh when executing subshell

---- Files affected:
SOURCES:
   lighttpd-use_bin_sh.patch (1.2 -> 1.3)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/lighttpd-use_bin_sh.patch
diff -u /dev/null SOURCES/lighttpd-use_bin_sh.patch:1.3
--- /dev/null	Tue Sep 19 14:36:07 2006
+++ SOURCES/lighttpd-use_bin_sh.patch	Tue Sep 19 14:36:02 2006
@@ -0,0 +1,40 @@
+## Use /bin/sh to execute external programs instead of getting
+## the shell from $SHELL (See ticket #388)
+#
+# http://trac.lighttpd.net/trac/ticket/388
+
+--- lighttpd-1.4.12/src/proc_open.c~	2006-09-19 15:32:30.253386029 +0300
++++ lighttpd-1.4.12/src/proc_open.c	2006-09-19 15:33:59.405384132 +0300
+@@ -148,17 +148,9 @@
+ 	STARTUPINFO si;
+ 	BOOL procok;
+ 	SECURITY_ATTRIBUTES security;
+-	const char *shell = NULL;
+-	const char *windir = NULL;
++	const char *shell = "/bin/sh";
+ 	buffer *cmdline;
+ 
+-	if (NULL == (shell = getenv(SHELLENV)) &&
+-			NULL == (windir = getenv("SystemRoot")) &&
+-			NULL == (windir = getenv("windir"))) {
+-		fprintf(stderr, "One of %s,%%SystemRoot,%%windir is required", SHELLENV);
+-		return -1;
+-	}
+-
+ 	/* we use this to allow the child to inherit handles */
+ 	memset(&security, 0, sizeof(security));
+ 	security.nLength = sizeof(security);
+@@ -180,12 +172,7 @@
+ 	memset(&pi, 0, sizeof(pi));
+ 
+ 	cmdline = buffer_init();
+-	if (shell) {
+-		buffer_append_string(cmdline, shell);
+-	} else {
+-		buffer_append_string(cmdline, windir);
+-		buffer_append_string(cmdline, "\\system32\\cmd.exe");
+-	}
++	buffer_append_string(cmdline, shell);
+ 	buffer_append_string_len(cmdline, CONST_STR_LEN(" /c "));
+ 	buffer_append_string(cmdline, command);
+ 	procok = CreateProcess(NULL, cmdline->ptr, &security, &security, TRUE,
================================================================