On Thu, Jul 2, 2020 at 2:32 PM Ruediger Pluem <[email protected]> wrote: > > On 7/2/20 2:22 PM, [email protected] wrote: > > Author: ylavic > > Date: Thu Jul 2 12:22:07 2020 > > New Revision: 1879438 > > > > URL: http://svn.apache.org/viewvc?rev=1879438&view=rev > > Log: > > mod_proxy_wstunnel: follow up to r1879418: handle first async lifetime too. > > > > Create the dedicated pfds and subpool in proxy_wstunnel_request() too, for > > the first call to ap_mpm_register_poll_callback_timeout(). > > > > While at it, add comments about why we need the dedicated pfds/subpool. > > > > > > Modified: > > httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c > > > > Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c > > URL: > > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1879438&r1=1879437&r2=1879438&view=diff > > ============================================================================== > > --- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original) > > +++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Thu Jul 2 > > 12:22:07 2020 > > > @@ -94,16 +95,24 @@ static void proxy_wstunnel_callback(void > > ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, baton->r, > > "proxy_wstunnel_callback suspend"); > > > > - if (baton->pfds) { > > - apr_pollfd_t *async_pfds = (void *)baton->pfds->elts; > > - apr_pollfd_t *tunnel_pfds = (void *)baton->tunnel->pfds->elts; > > - async_pfds[0].reqevents = tunnel_pfds[0].reqevents; > > - async_pfds[1].reqevents = tunnel_pfds[1].reqevents; > > - } > > - else { > > + if (!baton->pfds) { > > Can this still happen with the changes below?
No, fixed in r1879449. Thanks; Yann.
