new version 4.9.4

This commit is contained in:
Luboš Uhliarik 2022-09-15 01:26:09 +02:00
parent 9bacd03ce3
commit a8b773b009
4 changed files with 6 additions and 49 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ mod_wsgi-3.2.tar.gz
/mod_wsgi-4.9.0.tar.gz
/mod_wsgi-4.9.1.tar.gz
/mod_wsgi-4.9.3.tar.gz
/mod_wsgi-4.9.4.tar.gz

View File

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

View File

@ -15,7 +15,7 @@
%endif
Name: mod_wsgi
Version: 4.9.3
Version: 4.9.4
Release: 1%{?dist}
Summary: A WSGI interface for Python web applications in Apache
License: ASL 2.0
@ -24,7 +24,6 @@ Source0: https://github.com/GrahamDumpleton/mod_wsgi/archive/%{version}.t
Source1: wsgi.conf
Source2: wsgi-python3.conf
Patch1: mod_wsgi-4.5.20-exports.patch
Patch2: mod_wsgi-4.9.1-request-limit.patch
BuildRequires: httpd-devel
BuildRequires: gcc
@ -161,6 +160,9 @@ ln -s %{_bindir}/mod_wsgi-express-2 $RPM_BUILD_ROOT%{_bindir}/mod_wsgi-express
%endif
%changelog
* Wed Sep 14 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.9.4-1
- new version 4.9.4
* Wed Aug 31 2022 Luboš Uhliarik <luhliari@redhat.com> - 4.9.3-1
- new version 4.9.3

View File

@ -1 +1 @@
SHA512 (mod_wsgi-4.9.3.tar.gz) = 75061bee9a7d6b787c822cf396ce5e8c2c51d616648e6795f1ba170a9d771817df365115f633d3112330d800151697974863f1a0242408c511a233434fc3e2ec
SHA512 (mod_wsgi-4.9.4.tar.gz) = 0898221d95f0ce374cbd34a1849a6e6b5bd7850644d5fe36f558dcc58095cd535c854cb06798482d312485b8d89b8641d91fa26af3d208e10a6073b885af3199