From: Joe Orton <jorton@apache.org>
Date: Tue, 2 Dec 2003 14:50:36 +0000 (+0000)
Subject: Backport from HEAD:
X-Git-Tag: 2.0.49~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7a4a129070941adb2c30fb1d21783e8441d00c0;p=thirdparty%2Fapache%2Fhttpd.git

Backport from HEAD:

* modules/loggers/mod_log_config.c (log_request_time): Log
the minutes component of the timezone correctly.

PR: 23642
Submitted by: Hong-Gunn Chew <hgbug@gunnet.org>
Reviewed by: Joe Orton, Bill Stoddard, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101955 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index c29748448dd..39245db8d31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_log_config: Log the minutes component of the timezone correctly.
+     PR 23642.  [Hong-Gunn Chew <hgbug gunnet.org>]
+
   *) mod_proxy: Fix cases where an invalid status-line could be sent 
      to the client.  PR 23998.  [Joe Orton]
 
diff --git a/STATUS b/STATUS
index fa21d49c665..5b6e0df24cc 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/02 14:38:40 $]
+Last modified at [$Date: 2003/12/02 14:50:35 $]
 
 Release:
 
@@ -80,10 +80,6 @@ PATCHES TO BACKPORT FROM 2.1
       +1: stoddard
       +1 (concept): trawick (looks reasonable when compared with worker)
 
-    * Fix timezone handling in mod_log_config.  PR 23642
-      modules/loggers/mod_log_config.c: r1.107
-      +1: jorton, stoddard, trawick
-
     * parsed_uri.port is only valid iff parsed_uri.port_str != NULL.
       Old code simply checked if it was non-zero, not if it
       was *valid*
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 2e1fec74f47..4074f0d2826 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -570,7 +570,7 @@ static const char *log_request_time(request_rec *r, char *a)
                          "[%02d/%s/%d:%02d:%02d:%02d %c%.2d%.2d]",
                          xt.tm_mday, apr_month_snames[xt.tm_mon],
                          xt.tm_year+1900, xt.tm_hour, xt.tm_min, xt.tm_sec,
-                         sign, timz / (60*60), timz % (60*60));
+                         sign, timz / (60*60), (timz % (60*60)) / 60);
             cached_time->t_validate = t_seconds;
             memcpy(&(request_time_cache[i]), cached_time,
                    sizeof(*cached_time));