From: Yann Ylavic Date: Wed, 13 May 2015 13:22:09 +0000 (+0000) Subject: Revert r1678706: missing the get_request_end_time() part. X-Git-Tag: 2.2.30~112 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b45e5711116060c31d71048ff78bf16d279a1a;p=thirdparty%2Fapache%2Fhttpd.git Revert r1678706: missing the get_request_end_time() part. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1679205 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 05223aaf688..10152e30446 100644 --- a/CHANGES +++ b/CHANGES @@ -10,9 +10,6 @@ Changes with Apache 2.2.30 no If headers providing them on a resource we aren't modifying. [Ben Reser] - *) mod_log_config: Add %M format to output request duration in - milliseconds. [Ben Reser] - *) mod_ssl: New directive SSLSessionTickets (On|Off). The directive controls the use of TLS session tickets (RFC 5077), default value is "On" (unchanged behavior). diff --git a/STATUS b/STATUS index 89aabc80abb..13dd934d368 100644 --- a/STATUS +++ b/STATUS @@ -105,6 +105,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] + * mod_log_config: Add new format flag for requestion duration in milliseconds + trunk patch: http://svn.apache.org/r1675533 + 2.2.x patch: https://people.apache.org/~breser/httpd/2.2.x/patches/httpd-2.2.x-req_duration_milliseconds.patch (modulo CHANGES) + +1: breser, druggeri + -1: ylavic: Does not compile in 2.2.x... get_request_end_time() is missing. + We could either backport r979120 + r1467765 first (quite big), or + the get_request_end_time() part only. + * mpm_winnt service.c: Accept utf-8 service names/descriptions for i18n. trunk patches: http://svn.apache.org/r1611165 http://svn.apache.org/r1611169 diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index ec8af7d9ed8..6b71a8fe3a5 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -131,9 +131,6 @@ %m The request method - %M - The time taken to serve the request, in milliseconds. - %{Foobar}n The contents of note Foobar from another module. diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c index 930d35b8138..058a306deda 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -104,7 +104,6 @@ * %...{format}t: The time, in the form given by format, which should * be in strftime(3) format. * %...T: the time taken to serve the request, in seconds. - * %...M: the time taken to serve the request, in milliseconds * %...D: the time taken to serve the request, in micro seconds. * %...u: remote user (from auth; may be bogus if return status (%s) is 401) * %...U: the URL path requested. @@ -669,13 +668,6 @@ static const char *log_request_duration(request_rec *r, char *a) return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, apr_time_sec(duration)); } -static const char *log_request_duration_milliseconds(request_rec *r, char *a) -{ - apr_time_t duration = get_request_end_time(r) - r->request_time; - return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, apr_time_as_msec(duration)); -} - - static const char *log_request_duration_microseconds(request_rec *r, char *a) { return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, @@ -1582,7 +1574,6 @@ static int log_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp) log_pfn_register(p, "k", log_requests_on_connection, 0); log_pfn_register(p, "r", log_request_line, 1); log_pfn_register(p, "D", log_request_duration_microseconds, 1); - log_pfn_register(p, "M", log_request_duration_milliseconds, 1); log_pfn_register(p, "T", log_request_duration, 1); log_pfn_register(p, "U", log_request_uri, 1); log_pfn_register(p, "s", log_status, 1);