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 [email protected] 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 @@ > "<font size=\"+1\"><tt>%s</tt></font></dt>\n", > ap_get_server_built()); > ap_rprintf(r, > + "<dt><strong>Server loaded APR Version:</strong> " > + "<tt>%s</tt></dt>\n", apr_version_string()); > + ap_rprintf(r, > + "<dt><strong>Compiled with APR Version:</strong> " > + "<tt>%s</tt></dt>\n", APR_VERSION_STRING); > +#if APR_MAJOR_VERSION < 2 > + ap_rprintf(r, > + "<dt><strong>Server loaded APU Version:</strong> " > + "<tt>%s</tt></dt>\n", apu_version_string()); > + ap_rprintf(r, > + "<dt><strong>Compiled with APU Version:</strong> " > + "<tt>%s</tt></dt>\n", APU_VERSION_STRING); > +#endif > + ap_rprintf(r, > "<dt><strong>Module Magic Number:</strong> " > "<tt>%d:%d</tt></dt>\n", MODULE_MAGIC_NUMBER_MAJOR, > MODULE_MAGIC_NUMBER_MINOR); > > >
