80aec9
diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c
80aec9
index 59aad90..ef5f5af 100644
80aec9
--- a/src/server/mod_wsgi.c
80aec9
+++ b/src/server/mod_wsgi.c
80aec9
@@ -12586,6 +12586,9 @@ static apr_status_t wsgi_header_filter(ap_filter_t *f, apr_bucket_brigade *b)
80aec9
 
80aec9
     /* Output status line. */
80aec9
 
80aec9
+    if (!r->status_line)
80aec9
+        r->status_line = ap_get_status_line(r->status);
80aec9
+
80aec9
     vec1[0].iov_base = (void *)"Status:";
80aec9
     vec1[0].iov_len  = strlen("Status:");
80aec9
     vec1[1].iov_base = (void *)" ";
80aec9
@@ -12699,6 +12702,7 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
80aec9
     apr_bucket_brigade *bb;
80aec9
 
80aec9
     core_request_config *req_cfg;
80aec9
+    core_dir_config *d;
80aec9
 
80aec9
     ap_filter_t *current = NULL;
80aec9
     ap_filter_t *next = NULL;
80aec9
@@ -12890,6 +12894,23 @@ static int wsgi_hook_daemon_handler(conn_rec *c)
80aec9
 
80aec9
     r->per_dir_config  = r->server->lookup_defaults;
80aec9
 
80aec9
+    /*
80aec9
+     * Try and ensure that request body limit in daemon mode process
80aec9
+     * is unlimited as Apache 2.4.54 changed rules for limit and if
80aec9
+     * unset is now overridden by HTTP filters to be 1GiB rather than
80aec9
+     * unlimited. This is required since we populate configuration
80aec9
+     * from the base server config only so setting unlimited in a more
80aec9
+     * specific context such as a virtual host wouldn't be visible.
80aec9
+     * Note that setting this to unlimited in the daemon mode process
80aec9
+     * is okay as the request limit body is checked in the Apache
80aec9
+     * child process before request is proxied specifically to avoid
80aec9
+     * unecessarily passing the content across to the daemon process.
80aec9
+     */
80aec9
+
80aec9
+    d = (core_dir_config *)ap_get_core_module_config(r->per_dir_config);
80aec9
+
80aec9
+    d->limit_req_body = 0;
80aec9
+
80aec9
     r->sent_bodyct = 0;
80aec9
 
80aec9
     r->read_length = 0;