From 1b9efda9a7a64cc72a6f99d5d53f6db4c177a5d7 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: May 03 2019 09:02:09 +0000
Subject: mod_reqtimeout: fix default values regression (PR 63325)


---

diff --git a/httpd-2.4.37-r1857129.patch b/httpd-2.4.37-r1857129.patch
new file mode 100644
index 0000000..4dbf05a
--- /dev/null
+++ b/httpd-2.4.37-r1857129.patch
@@ -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
+ }
+ 
diff --git a/httpd.spec b/httpd.spec
index 288b515..672436b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.39
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -80,6 +80,7 @@ Patch37: httpd-2.4.37-sslprotdefault.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch58: httpd-2.4.34-r1738878.patch
 Patch59: httpd-2.4.34-r1555631.patch
+Patch61: httpd-2.4.37-r1857129.patch
 
 # Security fixes
 
@@ -239,6 +240,7 @@ interface for storing and accessing per-user session data.
 
 %patch58 -p1 -b .r1738878
 #%patch59 -p1 -b .r1555631
+%patch61 -p1 -b .r1857129
 
 # Patch in the vendor string
 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -727,6 +729,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Fri May  3 2019 Joe Orton <jorton@redhat.com> - 2.4.39-1.1
+- mod_reqtimeout: fix default values regression (PR 63325)
+
 * Tue Apr 02 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.39-1
 - new version 2.4.39