diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-03 14:44:22 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-03 14:44:22 +0000 |
| commit | c63de89e7c6ac7a08c2ebe7e2f396f4910a5fb64 (patch) | |
| tree | 14dfac66ef7bd987c5974574ada381fb0e892aba /usr.sbin/httpd/proc.c | |
| parent | 7cdb329d2f6f82cf64b278403a5b86aef2d5d992 (diff) | |
Replace [RELAY|SERVER]_MAXPROC with the new PROC_MAX_INSTANCES
variable and limit it from 128 to 32 instances (the old value).
While here, move a few PROC_ defines around.
OK rzalamena@
Diffstat (limited to 'usr.sbin/httpd/proc.c')
| -rw-r--r-- | usr.sbin/httpd/proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/httpd/proc.c b/usr.sbin/httpd/proc.c index a3c3ce549c2..b505d364a8c 100644 --- a/usr.sbin/httpd/proc.c +++ b/usr.sbin/httpd/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.25 2016/09/03 10:02:11 reyk Exp $ */ +/* $OpenBSD: proc.c,v 1.26 2016/09/03 14:44:21 reyk Exp $ */ /* * Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -131,7 +131,7 @@ proc_exec(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc, break; case 0: /* Prepare parent socket. */ - dup2(fd, PARENT_SOCK_FILENO); + dup2(fd, PROC_PARENT_SOCK_FILENO); execvp(argv[0], nargv); fatal("%s: execvp", __func__); @@ -556,7 +556,7 @@ proc_run(struct privsep *ps, struct privsep_proc *p, signal_add(&ps->ps_evsigusr1, NULL); proc_setup(ps, procs, nproc); - proc_accept(ps, PARENT_SOCK_FILENO, PROC_PARENT, 0); + proc_accept(ps, PROC_PARENT_SOCK_FILENO, PROC_PARENT, 0); if (p->p_id == PROC_CONTROL && ps->ps_instance == 0) { TAILQ_INIT(&ctl_conns); if (control_listen(&ps->ps_csock) == -1) |