diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-06-12 23:59:31 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-06-12 23:59:31 +0000 |
| commit | 7af68c0bf546ffe8aa86b9251258037eda6bc903 (patch) | |
| tree | 2bb33b97192e0e42931893e5aaf4d70f53b41d19 /include | |
| parent | ddc19c042ee44d8cfe17dd34ed6f9e7bdea2ebf8 (diff) | |
| download | httpd-7af68c0bf546ffe8aa86b9251258037eda6bc903.tar.gz | |
Solve the 80/20 by initializing and storing server_rec->timeout and
server_rec->keep_alive_timeout in apr_time_interval_t format (in apr
units, whatever they be), as both values exist to pass into APR, and
all APR timeouts are in apr_time_t.
Reviewed by: Cliff Woolley
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95623 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/httpd.h | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 9245480048..13938579b1 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -107,12 +107,13 @@ * 20020506 (2.0.37-dev) Removed r->boundary in request_rec. * 20020529 (2.0.37-dev) Standardized the names of some apr_pool_*_set funcs * 20020602 (2.0.37-dev) Bucket API change (metadata buckets) + * 20020612 (2.0.38-dev) Changed server_rec->[keep_alive_]timeout to apr time */ #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20020602 +#define MODULE_MAGIC_NUMBER_MAJOR 20020612 #endif #define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ diff --git a/include/httpd.h b/include/httpd.h index 78cdb4121a..e70044cba6 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -1078,10 +1078,10 @@ struct server_rec { /** I haven't got a clue */ server_addr_rec *addrs; - /** Timeout, in seconds, before we give up */ - int timeout; - /** Seconds we'll wait for another request */ - int keep_alive_timeout; + /** Timeout, as an apr interval, before we give up */ + apr_interval_time_t timeout; + /** The apr interval we will wait for another request */ + apr_interval_time_t keep_alive_timeout; /** Maximum requests per connection */ int keep_alive_max; /** Use persistent connections? */ |