]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1801144, r1801148, r1801456 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 11 Sep 2018 11:54:34 +0000 (11:54 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 11 Sep 2018 11:54:34 +0000 (11:54 +0000)
commitc7cb18efcf17322e4c477d42c6d35b605c5c7bb3
tree4d2828729a5c14a0416509141accc5233c2dcddb
parentb3af7481deebfe3fce0a405fd2d7cf26720dc7a1
Merge r1801144, r1801148, r1801456 from trunk:

mpm_winnt: Factor out a helper function to parse the type of an accept
filter and use an appropriate enum for it.

This makes the code in winnt_accept() a bit easier to follow.  As a minor
side effect, it also fixes a small bug where the "unrecognized AcceptFilter
'%s'" log entry would always contain "none" instead of the actually
unrecognized kind of the accept filter.

mpm_winnt: Fix typo in the logged message in winnt_get_connection().

mpm_winnt: Following up on r1801144, use the new accept_filter_e enum
values in a couple of missed places in winnt_accept().

Submitted by: kotkov
Reviewed by: jailletc36, jim (via inspection), wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840546 13f79535-47bb-0310-9956-ffa450edef68
STATUS
server/mpm/winnt/child.c