90508856d0
- Update to version 2.2.20, fix CVE-2011-3192 mod_deflate D.o.S. - Fix apache PR 45076 - Use SSL_MODE_RELEASE_BUFFERS to reduce mod_ssl memory usage - Add 2 patches from the "low hanging fruit" warnings in apache STATUS page. * mod_deflate: Stop compressing HEAD requests if there is not Content-Length header * mod_reqtimeout: Disable keep-alive after read timeout - Remove -fno-strict-aliasing from CFLAGS, no longer needed. - Allow KeepAliveTimeout to be expressed in miliseconds sometimes one second is too long, upstream r733557. - When linux changes to version 3.x configure tests are gonna break. remove version check, assuming kernel 2.2 or later. OBS-URL: https://build.opensuse.org/request/show/80399 OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=334
21 lines
731 B
Diff
21 lines
731 B
Diff
--- modules/http/http_core.c.orig
|
|
+++ modules/http/http_core.c
|
|
@@ -47,12 +47,15 @@ static int ap_process_http_connection(co
|
|
static const char *set_keep_alive_timeout(cmd_parms *cmd, void *dummy,
|
|
const char *arg)
|
|
{
|
|
+ apr_interval_time_t timeout;
|
|
const char *err = ap_check_cmd_context(cmd, NOT_IN_DIR_LOC_FILE|NOT_IN_LIMIT);
|
|
if (err != NULL) {
|
|
return err;
|
|
}
|
|
-
|
|
- cmd->server->keep_alive_timeout = apr_time_from_sec(atoi(arg));
|
|
+ /* Stolen from mod_proxy.c */
|
|
+ if (ap_timeout_parameter_parse(arg, &timeout, "s") != APR_SUCCESS)
|
|
+ return "KeepAliveTimeout has wrong format";
|
|
+ cmd->server->keep_alive_timeout = timeout;
|
|
return NULL;
|
|
}
|
|
|