From: Eric Covener Date: Mon, 7 Jul 2025 11:33:13 +0000 (+0000) Subject: port r1922115 from trunk X-Git-Tag: 2.4.64-rc1-candidate~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6189768ae9473bc00dc2d8238ee15bcdd03c34fd;p=thirdparty%2Fapache%2Fhttpd.git port r1922115 from trunk *) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer size. Submitted By: Jari Ahonen Reviewed By: rpluem, ylavic, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927029 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/changes-entries/pr69402.txt b/changes-entries/pr69402.txt new file mode 100644 index 0000000000..18a7dc7c0f --- /dev/null +++ b/changes-entries/pr69402.txt @@ -0,0 +1,2 @@ + *) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer + size. PR 69402 [Jari Ahonen ] diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c index 32ec9122da..356894ab64 100644 --- a/modules/proxy/mod_proxy_ajp.c +++ b/modules/proxy/mod_proxy_ajp.c @@ -218,6 +218,9 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, if (psf->io_buffer_size_set) maxsize = psf->io_buffer_size; + /* Override with worker setting if present */ + if (conn->worker->s->io_buffer_size_set) + maxsize = conn->worker->s->io_buffer_size; if (maxsize > AJP_MAX_BUFFER_SZ) maxsize = AJP_MAX_BUFFER_SZ; else if (maxsize < AJP_MSG_BUFFER_SZ)