VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-16 16:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ab: Add POLLERR and POLLHUP to reqevents for implementations that use/need it.

Browse Source 
Also, apr_pollset_remove() might return APR_NOTFOUND if a connection is reset
while being poll()ed, don't treat it as an error.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1910519 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2023-06-20 16:04:12 +00:00
parent 162a66654d
commit b82e99aadd
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
support/ab.c
View File

@ -599,10 +599,20 @@ static int set_polled_events(struct connection *c, apr_int16_t new_reqevents)
{
apr_status_t rv;
/* Add POLLHUP and POLLERR to reqevents should some pollset
* implementations need/use them.
*/
if (new_reqevents != 0) {
new_reqevents |= APR_POLLERR;
if (new_reqevents & APR_POLLIN) {
new_reqevents |= APR_POLLHUP;
}
}
if (c->pollfd.reqevents != new_reqevents) {
if (c->pollfd.reqevents != 0) {
rv = apr_pollset_remove(c->worker->pollset, &c->pollfd);
if (rv != APR_SUCCESS) {
if (rv != APR_SUCCESS && !APR_STATUS_IS_NOTFOUND(rv)) {
graceful_strerror("apr_pollset_remove()", rv);
return 0;
}