httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r662575 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/metadata/mod_unique_id.c
Date Mon, 02 Jun 2008 21:27:12 GMT
Author: rpluem
Date: Mon Jun  2 14:27:12 2008
New Revision: 662575

URL: http://svn.apache.org/viewvc?rev=662575&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=662575&r1=662574&r2=662575&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Jun  2 14:27:12 2008
@@ -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]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=662575&r1=662574&r2=662575&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Jun  2 14:27:12 2008
@@ -90,14 +90,6 @@
 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 ]
 

Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c?rev=662575&r1=662574&r2=662575&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_unique_id.c Mon Jun  2 14:27:12 2008
@@ -304,7 +304,7 @@
     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



Mime
View raw message