From: Eric Covener <covener@apache.org>
Date: Wed, 11 Aug 2021 10:49:56 +0000 (+0000)
Subject: tolerate apr-1.5
X-Git-Tag: 2.5.0-alpha2-ci-test-only~871
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fb2910feb8890f2358b443a620b1a424c9adc9e;p=thirdparty%2Fapache%2Fhttpd.git

tolerate apr-1.5


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1892207 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/util.c b/server/util.c
index d87417f7621..e44e39afe3e 100644
--- a/server/util.c
+++ b/server/util.c
@@ -2668,7 +2668,7 @@ AP_DECLARE(char *) ap_append_pid(apr_pool_t *p, const char *string,
  * in timeout_parameter.
  * @return Status value indicating whether the parsing was successful or not.
  */
-#define CHECK_OVERFLOW(a, b) if (a > b) return APR_ERANGE
+#define CHECK_OVERFLOW(a, b) if (a > b) return APR_EGENERAL
 AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(
                                                const char *timeout_parameter,
                                                apr_interval_time_t *timeout,
@@ -2691,7 +2691,7 @@ AP_DECLARE(apr_status_t) ap_timeout_parameter_parse(
     }
 
     if (tout < 0) { 
-        return APR_ERANGE;
+        return APR_EGENERAL;
     }
 
     switch (*time_str) {