You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ta...@apache.org on 2009/07/09 15:45:35 UTC
svn commit: r792554 - in /httpd/httpd/branches/2.2.x: STATUS
modules/generators/mod_info.c
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);
RE: svn commit: r792554 - in /httpd/httpd/branches/2.2.x: STATUS modules/generators/mod_info.c
Posted by "Plüm, Rüdiger, VF-Group" <ru...@vodafone.com>.
> -----Original Message-----
> From: Rainer Jung
> Sent: Donnerstag, 9. Juli 2009 16:05
> To: dev@httpd.apache.org
> Subject: Re: svn commit: r792554 - in
> /httpd/httpd/branches/2.2.x: STATUS modules/generators/mod_info.c
>
> On 09.07.2009 15:45, 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
> >
>
> I guess the following part of the commit was an accident?
Which one exactly?
Regards
Rüdiger
Re: svn commit: r792554 - in /httpd/httpd/branches/2.2.x: STATUS
modules/generators/mod_info.c
Posted by Rainer Jung <ra...@kippdata.de>.
On 09.07.2009 15:45, 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
>
I guess the following part of the commit was an accident?
That patch is still voted on in the status file.
> 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);
>
Regards,
Rainer
Re: Apology for r792554
Posted by Takashi Sato <ta...@lans-tv.com>.
On Thu, 9 Jul 2009 16:17:15 +0200
"Plüm, Rüdiger, VF-Group" <ru...@vodafone.com> wrote:
>
>
> > -----Original Message-----
> > From: Takashi Sato [mailto:takashi@lans-tv.com]
> > Sent: Donnerstag, 9. Juli 2009 16:10
> > To: dev@httpd.apache.org
> > Subject: Apology for r792554
> >
> > Sorry. I accidentally committed mod_info.c of 2.2.x branches.
> > Should I revert it? Or what should I do?
>
> Yes, please revert the changes to
> httpd/httpd/branches/2.2.x/modules/generators/mod_info.c
>
Done. r792560.
RE: Apology for r792554
Posted by "Plüm, Rüdiger, VF-Group" <ru...@vodafone.com>.
> -----Original Message-----
> From: Takashi Sato [mailto:takashi@lans-tv.com]
> Sent: Donnerstag, 9. Juli 2009 16:10
> To: dev@httpd.apache.org
> Subject: Apology for r792554
>
> Sorry. I accidentally committed mod_info.c of 2.2.x branches.
> Should I revert it? Or what should I do?
Yes, please revert the changes to
httpd/httpd/branches/2.2.x/modules/generators/mod_info.c
Regards
Rüdiger
Re: Apology for r792554
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Takashi Sato wrote:
> Sorry. I accidentally committed mod_info.c of 2.2.x branches.
> Should I revert it? Or what should I do?
If your -1 just became a +1 (with the #include's) then simply
svn propedit --revprop -r792554 svn:log
and fix the commit message :) Then simply commit an update to
the STATUS removing this vote-item.
Apology for r792554
Posted by Takashi Sato <ta...@lans-tv.com>.
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 @@
> "<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);
>
>
>