2.4.18: cater ap_timeout_parameter_parse for Apache 2.2

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

src/cfg/parse.c

@@ -204,9 +204,18 @@ const char *oidc_cfg_parse_timeout_min_max(apr_pool_t *pool, const char *arg, ap
 					   apr_interval_time_t min_value, apr_interval_time_t max_value) {
 	apr_interval_time_t timeout;
 
+#if AP_MODULE_MAGIC_AT_LEAST(20080920, 2)
 	if (ap_timeout_parameter_parse(arg, &timeout, "s") != APR_SUCCESS) {
 		return apr_psprintf(pool, "not a valid timeout parameter: %s", arg);
 	}
+#else
+	timeout = apr_strtoi64(arg, &endptr, 10);
+	if (errno != 0 || *endptr != '\0') {
+		return apr_psprintf(pool, "not a valid timeout parameter: %s", arg);
+	}
+	timeout = apr_time_from_sec(timeout);
+#endif
+
 	if (timeout < min_value) {
 		return apr_psprintf(pool,
 				    "timeout value %" APR_TIME_T_FMT

test/test_cfg.c

@@ -108,12 +108,12 @@ START_TEST(test_cfg_cache_connections_ttl) {
 	rv = oidc_cmd_cache_memcache_ttl_set(cmd, ptr, arg);
 	ck_assert_msg(rv != NULL, "set to 4295 did not fail");
 
-	arg = "180s";
+	arg = "180";
 	rv = oidc_cmd_cache_memcache_ttl_set(cmd, ptr, arg);
 	ck_assert_msg(rv == NULL, "set to 180s failed");
 
 	ttl = oidc_cfg_cache_memcache_ttl_get(cfg);
-	ck_assert_msg(ttl == apr_time_from_sec(180), "get 180s failed: %d", (int)ttl);
+	ck_assert_msg(ttl == apr_time_from_sec(180), "get 180 failed: %d", (int)ttl);
 }
 END_TEST