From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Jun 2006 23:38:11 +0000 (-0700)
Subject: Merge branch 'jc/upload-corrupt' into next
X-Git-Tag: v1.4.1-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/78831b40d6ce24cdbcbfded049cb251097c58c13?hp=-c

Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
daemon: send stderr to /dev/null instead of closing.
---

78831b40d6ce24cdbcbfded049cb251097c58c13
diff --combined daemon.c
index a19b7b5aaa,0747ce2a37..1ba4d669da
--- a/daemon.c
+++ b/daemon.c
@@@ -673,11 -673,6 +673,11 @@@ int main(int argc, char **argv
  	int inetd_mode = 0;
  	int i;
  
 +	/* Without this we cannot rely on waitpid() to tell
 +	 * what happened to our children.
 +	 */
 +	signal(SIGCHLD, SIG_DFL);
 +
  	for (i = 1; i < argc; i++) {
  		char *arg = argv[i];
  
@@@ -762,7 -757,7 +762,7 @@@
  		struct sockaddr *peer = (struct sockaddr *)&ss;
  		socklen_t slen = sizeof(ss);
  
- 		fclose(stderr); //FIXME: workaround
+ 		freopen("/dev/null", "w", stderr);
  
  		if (getpeername(0, peer, &slen))
  			peer = NULL;