summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-01-02 13:49:20 +0100
committerReyk Floeter <reyk@esdenera.com>2015-01-02 13:49:20 +0100
commit443c85a053b7a4f3b0ab8bb4e17fb4ef7a3f43c3 (patch)
treef1c52d9a3fa439b4163341e6093623d2f3dd67d4 /proc.c
parent185aa0947c6841726c4d9dd029a723ee27993a37 (diff)
downloadhttpd-443c85a053b7a4f3b0ab8bb4e17fb4ef7a3f43c3.tar.gz
httpd-443c85a053b7a4f3b0ab8bb4e17fb4ef7a3f43c3.zip
Sync with -current: change TLS to SSL, support HEAD, other changes.
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/proc.c b/proc.c
index d0994f8..95c3e98 100644
--- a/proc.c
+++ b/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.5 2014/10/25 03:23:49 lteo Exp $ */
+/* $OpenBSD: proc.c,v 1.7 2014/12/21 00:54:49 guenther Exp $ */
/*
* Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/ip.h>
-#include <arpa/inet.h>
#include <stdio.h>
#include <stdlib.h>
@@ -351,7 +350,7 @@ proc_run(struct privsep *ps, struct privsep_proc *p,
fatal("proc_run: cannot fork");
case 0:
/* Set the process group of the current process */
- setpgrp(0, getpid());
+ setpgid(0, 0);
break;
default:
return (pid);