Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 3540 invoked from network); 9 Jul 2009 14:10:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Jul 2009 14:10:08 -0000 Received: (qmail 66549 invoked by uid 500); 9 Jul 2009 14:10:17 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 66479 invoked by uid 500); 9 Jul 2009 14:10:17 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 66470 invoked by uid 99); 9 Jul 2009 14:10:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 14:10:17 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of takashi@lans-tv.com designates 133.205.103.2 as permitted sender) Received: from [133.205.103.2] (HELO msagw.biglobe.ne.jp) (133.205.103.2) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2009 14:10:06 +0000 Received: from mkh (60.237.166.124 [60.237.166.124]) by smtp-gw.biglobe.ne.jp id XAAE85CD6702; Thu, 09 Jul 2009 23:09:42 +0900 (JST) Date: Thu, 9 Jul 2009 23:09:42 +0900 From: Takashi Sato To: dev@httpd.apache.org Subject: Apology for r792554 Message-Id: <20090709230942.20873584.takashi@lans-tv.com> In-Reply-To: <20090709134536.01A912388898@eris.apache.org> References: <20090709134536.01A912388898@eris.apache.org> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Sorry. I accidentally committed mod_info.c of 2.2.x branches. Should I revert it? Or what should I do? On Thu, 09 Jul 2009 13:45:35 -0000 takashi@apache.org wrote: > Author: takashi > Date: Thu Jul 9 13:45:35 2009 > New Revision: 792554 > > URL: http://svn.apache.org/viewvc?rev=792554&view=rev > Log: > vote and comment > > Modified: > httpd/httpd/branches/2.2.x/STATUS > httpd/httpd/branches/2.2.x/modules/generators/mod_info.c > > Modified: httpd/httpd/branches/2.2.x/STATUS > URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=792554&r1=792553&r2=792554&view=diff > ============================================================================== > --- httpd/httpd/branches/2.2.x/STATUS (original) > +++ httpd/httpd/branches/2.2.x/STATUS Thu Jul 9 13:45:35 2009 > @@ -124,7 +124,7 @@ > http://svn.apache.org/viewvc?view=rev&revision=780692 > http://svn.apache.org/viewvc?view=rev&revision=780697 > http://svn.apache.org/viewvc?view=rev&revision=780699 > - +1: niq, rpluem > + +1: niq, rpluem, takashi > > * mod_proxy_http: fix Host: header for literal IPv6 addresses. > PR 47177 > @@ -144,6 +144,7 @@ > patch updated: removed font clutter as suggested by niq, > added compile-time version output as suggested by wrowe. > +1: fuankg, wrowe > + -1: takashi; This doesn't compile because it doesn't include apu_version.h > > * unixd: set suexec_enabled correctly when httpd is run by non-root > PR 42175 > > Modified: httpd/httpd/branches/2.2.x/modules/generators/mod_info.c > URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/generators/mod_info.c?rev=792554&r1=792553&r2=792554&view=diff > ============================================================================== > --- httpd/httpd/branches/2.2.x/modules/generators/mod_info.c (original) > +++ httpd/httpd/branches/2.2.x/modules/generators/mod_info.c Thu Jul 9 13:45:35 2009 > @@ -44,6 +44,8 @@ > #include "apr.h" > #include "apr_strings.h" > #include "apr_lib.h" > +#include "apr_version.h" > +#include "apu_version.h" > #define APR_WANT_STRFUNC > #include "apr_want.h" > > @@ -352,6 +354,20 @@ > "%s\n", > ap_get_server_built()); > ap_rprintf(r, > + "
Server loaded APR Version: " > + "%s
\n", apr_version_string()); > + ap_rprintf(r, > + "
Compiled with APR Version: " > + "%s
\n", APR_VERSION_STRING); > +#if APR_MAJOR_VERSION < 2 > + ap_rprintf(r, > + "
Server loaded APU Version: " > + "%s
\n", apu_version_string()); > + ap_rprintf(r, > + "
Compiled with APU Version: " > + "%s
\n", APU_VERSION_STRING); > +#endif > + ap_rprintf(r, > "
Module Magic Number: " > "%d:%d
\n", MODULE_MAGIC_NUMBER_MAJOR, > MODULE_MAGIC_NUMBER_MINOR); > > >