* Convert request time to seconds before before storing it in unique_id_rec

  struct.

PR: 37064
Submitted by: Kobayashi <kobayashi firstserver.co.jp>
Reviewed by: rpluem

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

diff --git a/CHANGES b/CHANGES
index 1d45034146f3085324a849c66bfc8002c1f8fa41..bde8f678ac5617fd1e98531e3105019be07f7cc2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_unique_id: Fix timestamp value in UNIQUE_ID.
+     PR 37064 [Kobayashi <kobayashi firstserver.co.jp>]
+
   *) core: Handle unrecognised transfer-encodings.
      PR 43882 [Nick Kew]
 

diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 27e18d53450c44d761850382f4c2a1a16f12d92c..a78e02068035939bb3ee35b6e4a127ef1e1fabc8 100644 (file)
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -304,7 +304,7 @@ static int gen_unique_id(request_rec *r)
     new_unique_id.pid = cur_unique_id.pid;
     new_unique_id.counter = cur_unique_id.counter;
 
-    new_unique_id.stamp = htonl((unsigned int)r->request_time);
+    new_unique_id.stamp = htonl((unsigned int)apr_time_sec(r->request_time));
     new_unique_id.thread_index = htonl((unsigned int)r->connection->id);
 
     /* we'll use a temporal buffer to avoid uuencoding the possible internal