Attachment 38004 Details for Bug 65519 – Issue a nonblocking instead of ap_filter_input_pending()

[patch] Issue a nonblocking instead of ap_filter_input_pending()

ap_filter_input_pending.diff (text/plain), 1.16 KB, created by Yann Ylavic on 2021-08-30 14:53:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yann Ylavic

Created: 2021-08-30 14:53:15 UTC

Size: 1.16 KB

patch

obsolete

>Index: modules/proxy/proxy_util.c
>===================================================================
>--- modules/proxy/proxy_util.c	(revision 1892572)
>+++ modules/proxy/proxy_util.c	(working copy)
>@@ -4444,11 +4444,6 @@ static APR_INLINE int ap_filter_output_pending(con
>     return c->data_in_output_filters ? OK : DECLINED;
> }
> 
>-static APR_INLINE int ap_filter_input_pending(conn_rec *c)
>-{
>-    return c->data_in_input_filters ? OK : DECLINED;
>-}
>-
> PROXY_DECLARE(apr_status_t) ap_proxy_buckets_lifetime_transform(request_rec *r,
>                                                       apr_bucket_brigade *from,
>                                                       apr_bucket_brigade *to)
>@@ -4966,7 +4961,7 @@ PROXY_DECLARE(int) ap_proxy_tunnel_run(proxy_tunne
>                      * the next POLLIN will trigger and retaining data might
>                      * block the protocol.
>                      */
>-                    if (ap_filter_input_pending(in->c) == OK) {
>+                    if (in->pfd->reqevents & APR_POLLIN) {
>                         rc = proxy_tunnel_forward(tunnel, in);
>                         if (rc != OK) {
>                             return rc;

Actions: View | Diff

Attachments on bug 65519: 37988 | 38003 | 38004 | 38005