From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 2 Jun 2008 21:27:12 +0000 (+0000)
Subject: Merge r596448 from trunk:
X-Git-Tag: 2.2.9~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0352beb5063e889e9d6ce4b421496701b2b0fc4a;p=thirdparty%2Fapache%2Fhttpd.git

Merge r596448 from trunk:

* 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, jim, pquerna


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

diff --git a/CHANGES b/CHANGES
index 820a75d0d08..a7d5fd49447 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) mod_unique_id: Fix timestamp value in UNIQUE_ID.
+     PR 37064 [Kobayashi <kobayashi firstserver.co.jp>]
+
   *) htpasswd: Fix salt generation weakness. PR 31440
      [Andreas Krennmair <ak synflood.at>, Peter Watkins <peterw tux.org>,
      Paul Querna]
diff --git a/STATUS b/STATUS
index a2a65eff143..cf14a32bae2 100644
--- a/STATUS
+++ b/STATUS
@@ -90,14 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_unique_id: Convert request time to seconds before before storing it in
-   unique_id_rec struct. PR 37064
-    Trunk version of patch:
-       http://svn.apache.org/viewvc?rev=596448&view=rev
-    Backport version for 2.2.x of patch:
-       Trunk version of patch works
-    +1: rpluem, jim, pquerna
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 27e18d53450..a78e0206803 100644
--- 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