X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/170e930f9d29039a4f8d385ec3bd9850c1cf95fa..5674e7fc1273800554c23ad6194e8a06dee851ae:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 927368fae..c39aa2ef7 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -49,6 +49,7 @@ sub gen_wrapper () {
 	push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
 	               CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
 		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
+		       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
 		       REDIRECT_URL} if $config{cgi};
 	my $envsave="";
 	foreach my $var (@envsave) {
@@ -94,7 +95,7 @@ EOF
 		# IKIWIKI_CGILOCK_FD so unlockwiki can close it.
 		$pre_exec=<<"EOF";
 	lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
-	if (lockfd != -1 && flock(lockfd, LOCK_EX) == 0) {
+	if (lockfd != -1 && lockf(lockfd, F_LOCK, 0) == 0) {
 		char *fd_s=malloc(8);
 		sprintf(fd_s, "%i", lockfd);
 		setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
@@ -128,7 +129,7 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
-char *newenviron[$#envsave+6];
+char *newenviron[$#envsave+7];
 int i=0;
 
 void addenv(char *var, char *val) {
@@ -147,6 +148,7 @@ $check_commit_hook
 @wrapper_hooks
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
+	newenviron[i++]="PATH=$ENV{PATH}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
 #ifdef __TINYC__
@@ -235,8 +237,7 @@ EOF
 		error("rename $wrapper.new $wrapper: $!");
 	}
 	#translators: The parameter is a filename.
-	printf(gettext("successfully generated %s"), $wrapper);
-	print "\n";
+	debug(sprintf(gettext("successfully generated %s"), $wrapper));
 }
 
 1