Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 30598 invoked from network); 2 Jun 2008 21:27:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jun 2008 21:27:47 -0000 Received: (qmail 94872 invoked by uid 500); 2 Jun 2008 21:27:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 94817 invoked by uid 500); 2 Jun 2008 21:27:49 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 94798 invoked by uid 99); 2 Jun 2008 21:27:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2008 14:27:49 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jun 2008 21:26:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B33252388A09; Mon, 2 Jun 2008 14:27:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080602212712.B33252388A09@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 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 ] + *) htpasswd: Fix salt generation weakness. PR 31440 [Andreas Krennmair , Peter Watkins , 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