mod_proxy_wstunnel: Bypass the handler while the connection is not upgraded to WebSocket, so that other modules can possibly take over the leading HTTP requests.

mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad Gateway) when no response is ever received from the backend.

mod_proxy_{connect,wstunnel}: follow up to r1657636. Since rv is not used as an apr_status_t in the loop (it's logging is done by proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean instead to avoid the ugly ORs between APR error codes.

mod_proxy_connect/wstunnel: If both client and backend sides get readable at the same time, don't lose errors occuring while forwarding on the first side when none occurs next on the other side, and abort.

Synch trunk with 2.4.x. In r1588495, additionnal logging has been added to 2.4.x as part of the merge.

mod_proxy_wstunnel: abort backend connection on polling error to avoid further processing (lingering close, SSL shutdown).

Silent some cppcheck warnings.

Revert r1601943, r1602058, r1605307 (socket callback returning pollfds) Revert r1605369 (wstunnel refactoring) per discassion on dev@httpd.a.o thread Message-ID: <CALK=YjN9HfThP_k_rF9iJPcUhcQk9sNOaDPxZNG+HcJNWS4ZAQ@mail.gmail.com>

Async mod_proxy_wstunnel: Resume a client connection from SUSPENDED state to avoid the connection remain suspended.

Refactor asynchronous mod_proxy_wstunnel using pollfd returned by MPM. r1601943 and r1605307 made Event MPM return woken pollfd, so async wstunnel doesn't need its own apr_pollset_poll.

Use ap_remove_input_filter_byhandle instead of duplicating the code.

Socket event callback now takes pollfd. User (e.g. mod_proxy_wstunnel) can know which socket is ready.

* apr_status_t vs HTTP status code fix * use APR_STATUS_IS_ENOTIMPL rather than direct comparison

Private function doesn't need ap_ prefix.

mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme. PR55320. Submitted by: Alex Liu <alex.leo.ca gmail.com> Committed by: ylavic

Extend the socket callbacks in event to allow a timeout on the I/O callback. When a socket callback has a timeout, an associated timer event is used to remove the sockets from the pollset and call a timeout function. * This includes a noteworthy change to the main event loop. Previously, we would call epoll, then process the timer events, then iterate through the poll results. After this patch, the timer events are processed before the poll() a _non-queued_ action can change the pollset conents (a users timed callback function conversely could easily sit in a queue while the main thread continues down into epoll) * timer events can now have sockets associated with them, those sockets are removed from the pollset when the timer event fires w/o a queue to the worker. * timer events now have a canceled flag that can be toggled without locking the timer list. * Drop the severity of some wstunnel messages from DEBUG to TRACE1 * Lift the restriction on using asynchronous websockets connections but having an idle timeout

whitespace changes only

followup to r1587036. if backend->close is set too early, proxy_util.c will close it right away and then blow away the field.

s/asynch/async

several related mod_proxy_wstunnel changes that are tough to pull apart: * make async websockets tunnel opt-in * add config for how long we block a thread in asynch mode * add config for a cap on the synchronous path * avoid sending error responses down the upgraded tunnel

stop leaking websockets backend connections (trunk only)

cleanup wstunnel error handling Submitted By: covener, ylavic, Edward Lu Commited By: covener

actually remove mod_reqtimeout, since the util_filter functions involved only manipulate c->input_filters no matter what we pass. We need to make copies of c->input_filters after, not before, it skips over reqtimeout. Note: reqtimeout doesn't really interfere today with normal operation, but this is misleading/confusing when dealing with other wstunnel issues.

*) mod_proxy_wstunnel: Don't pool backend websockets connections, because we need to handshake every time. PR 55890. [Eric Covener]

handle POLLERR/POLLHUP during poll() to avoid high CPU busy loop. Submitted By: Joffroy Christen <joffroy.christen solvaxis com>, Eric Covener] Committed By: covener

Add no's

typo

Fix for stupid CodeWarrior compiler.

Fold in Eric Covener's socket callback

Keep mod_req clear. Simply scan thru input filters and remove it within the ws submodule. Nasty, but it keeps mod_req untouched (for now ;) )

bypass reqtimeout for websockets

streamline

don't strip these, ensure that they exist.

"final" rename :)