Skip to content

core: Propagate make_sock() failures when duplicating listeners #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arturobernalg wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

core: Propagate make_sock() failures when duplicating listeners #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changes-entries/core-duplicate-listeners.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*) core: Fail startup or restart when a duplicated listening socket
cannot be initialized, instead of continuing with a broken listener.
PR 70106. [Xuqing Yang]
5 changes: 4 additions & 1 deletion server/listen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,10 @@ AP_DECLARE(apr_status_t) ap_duplicate_listeners(apr_pool_t *p, server_rec *s,
duplr->bind_addr);
return stat;
}
make_sock(p, duplr, 1);
stat = make_sock(p, duplr, 1);
if (stat != APR_SUCCESS) {
return stat;
}
}
#if AP_NONBLOCK_WHEN_MULTI_LISTEN
use_nonblock = (ap_listeners && ap_listeners->next);
Expand Down
Loading