Merge branch 'ploppy-fix_ipv6_crash'

This commit is contained in:
Tatsuhiro Tsujikawa 2016-01-13 22:55:59 +09:00
commit 6cc5d71ffe
1 changed files with 1 additions and 1 deletions

View File

@ -391,7 +391,7 @@ int worker_process_event_loop(WorkerProcessConfig *wpconf) {
conn_handler.set_acceptor6(
make_unique<AcceptHandler>(wpconf->server_fd6, &conn_handler));
}
if (wpconf->server_fd != 1) {
if (wpconf->server_fd != -1) {
conn_handler.set_acceptor(
make_unique<AcceptHandler>(wpconf->server_fd, &conn_handler));
}