port r1922115 from trunk

   *) mod_proxy_ajp: Use iobuffersize set on worker level for the IO buffer
      size.

Submitted By: Jari Ahonen <jah@progress.com>
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 (file)
index 0000000..18a7dc7
--- /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 <jah@progress.com>]

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 32ec9122dadc85862732d7ef6b80636bd96b2a98..356894ab6439e745bc5db7667f2289c9310d026b 100644 (file)
--- 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)