rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- mod_reqtimeout: fix default values regression (PR 63325)

Browse Source
This commit is contained in:
Joe Orton 2019-04-16 08:49:29 +01:00
parent 3aa63a93a9
commit fc24275107
2 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
httpd-2.4.37-r1857129.patch Normal file
View File

@ -0,0 +1,65 @@
# ./pullrev.sh 1857129
http://svn.apache.org/viewvc?view=revision&revision=1857129
--- httpd-2.4.37/modules/filters/mod_reqtimeout.c
+++ httpd-2.4.37/modules/filters/mod_reqtimeout.c
@@ -31,7 +31,7 @@
#define UNSET -1
#define MRT_DEFAULT_handshake_TIMEOUT 0 /* disabled */
#define MRT_DEFAULT_handshake_MAX_TIMEOUT 0
-#define MRT_DEFAULT_handshake_MIN_RATE APR_INT32_MAX
+#define MRT_DEFAULT_handshake_MIN_RATE 0
#define MRT_DEFAULT_header_TIMEOUT 20
#define MRT_DEFAULT_header_MAX_TIMEOUT 40
#define MRT_DEFAULT_header_MIN_RATE 500
@@ -220,7 +220,7 @@
if (block == APR_NONBLOCK_READ || mode == AP_MODE_INIT
|| mode == AP_MODE_EATCRLF) {
rv = ap_get_brigade(f->next, bb, mode, block, readbytes);
- if (ccfg->cur_stage.rate_factor > 0 && rv == APR_SUCCESS) {
+ if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS) {
extend_timeout(ccfg, bb);
}
return rv;
@@ -254,7 +254,7 @@
}
if (!APR_BRIGADE_EMPTY(bb)) {
- if (ccfg->cur_stage.rate_factor > 0) {
+ if (ccfg->cur_stage.rate_factor) {
extend_timeout(ccfg, bb);
}
@@ -315,7 +315,7 @@
* the real (relevant) bytes to be asked later, within the
* currently alloted time.
*/
- if (ccfg->cur_stage.rate_factor > 0 && rv == APR_SUCCESS
+ if (ccfg->cur_stage.rate_factor && rv == APR_SUCCESS
&& mode != AP_MODE_SPECULATIVE) {
extend_timeout(ccfg, bb);
}
@@ -638,17 +638,17 @@
ap_hook_post_read_request(reqtimeout_before_body, NULL, NULL,
APR_HOOK_MIDDLE);
-#if MRT_DEFAULT_HANDSHAKE_MIN_RATE > 0
+#if MRT_DEFAULT_handshake_MIN_RATE
default_handshake_rate_factor = apr_time_from_sec(1) /
- MRT_DEFAULT_HANDSHAKE_MIN_RATE;
+ MRT_DEFAULT_handshake_MIN_RATE;
#endif
-#if MRT_DEFAULT_HEADER_MIN_RATE > 0
+#if MRT_DEFAULT_header_MIN_RATE
default_header_rate_factor = apr_time_from_sec(1) /
- MRT_DEFAULT_HEADER_MIN_RATE;
+ MRT_DEFAULT_header_MIN_RATE;
#endif
-#if MRT_DEFAULT_BODY_MIN_RATE > 0
+#if MRT_DEFAULT_body_MIN_RATE
default_body_rate_factor = apr_time_from_sec(1) /
- MRT_DEFAULT_BODY_MIN_RATE;
+ MRT_DEFAULT_body_MIN_RATE;
#endif
}

4
httpd.spec
View File

@ -81,6 +81,8 @@ Patch39: httpd-2.4.37-sslprotdefault.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
Patch58: httpd-2.4.34-r1738878.patch Patch58: httpd-2.4.34-r1738878.patch
Patch60: httpd-2.4.34-enable-sslv3.patch Patch60: httpd-2.4.34-enable-sslv3.patch
# https://bz.apache.org/bugzilla/show_bug.cgi?id=63325
Patch61: httpd-2.4.37-r1857129.patch
# Security fixes # Security fixes
@ -228,6 +230,7 @@ interface for storing and accessing per-user session data.
%patch58 -p1 -b .r1738878 %patch58 -p1 -b .r1738878
%patch60 -p1 -b .enable-sslv3 %patch60 -p1 -b .enable-sslv3
%patch61 -p1 -b .r1857129
# Patch in the vendor string # Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@ -733,6 +736,7 @@ exit $rv
%changelog %changelog
* Tue Apr 9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3 * Tue Apr 9 2019 Joe Orton <jorton@redhat.com> - 2.4.39-3
- fix statedir symlink to point to /var/lib/httpd (#1697662) - fix statedir symlink to point to /var/lib/httpd (#1697662)
- mod_reqtimeout: fix default values regression (PR 63325)
* Tue Apr 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-2 * Tue Apr 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-2
- update to 2.4.39 - update to 2.4.39