From: Ben Reser Date: Tue, 19 May 2015 04:23:01 +0000 (+0000) Subject: * STATUS: Revote for r1675533. X-Git-Tag: 2.2.30~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eded0940b3e7ce34d39f60516f066da1ed82dcf9;p=thirdparty%2Fapache%2Fhttpd.git * STATUS: Revote for r1675533. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1680162 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 156fe4c4ddf..8946ad3369d 100644 --- a/STATUS +++ b/STATUS @@ -123,10 +123,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1675533 2.2.x patch: https://people.apache.org/~ylavic/httpd-2.2.x-req_duration_milliseconds-v1.patch (modulo CHANGES) - +1: ylavic + +1: ylavic, breser ylavic: first accepted merge reverted in r1679205, due to missing get_request_end_time() in 2.2.x. v1 now s/get_request_end_time(r)/apr_time_now()/ - breser and druggeri votes discarded. + druggeri vote discarded. * mpm_winnt service.c: Accept utf-8 service names/descriptions for i18n. trunk patches: http://svn.apache.org/r1611165