You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2006/04/01 08:22:26 UTC
svn commit: r390597 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
server/main.c
Author: pquerna
Date: Fri Mar 31 22:22:25 2006
New Revision: 390597
URL: http://svn.apache.org/viewcvs?rev=390597&view=rev
Log:
Merge r390573 from trunk:
With all of the, uhm, interesting manners in which httpd
can be built and installed, let's ensure httpd -V gives the
reporter a chance to identify the APR flavor used to compile
and to run httpd when reporting bugs.
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/main.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=390597&r1=390596&r2=390597&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Mar 31 22:22:25 2006
@@ -14,6 +14,9 @@
made to ap_escape_html so we escape quotes. Reported by JPCERT.
[Mark Cox]
+ *) Add APR/APR-Util Compiled and Runtime Version numbers to the
+ output of 'httpd -V'. [William Rowe]
+
*) http: If a connection is aborted while waiting for a chunked line,
flag the connection as errored out. [Justin Erenkrantz]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=390597&r1=390596&r2=390597&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Mar 31 22:22:25 2006
@@ -83,11 +83,6 @@
Trunk version of patch works
+1: rpluem, pquerna, rooneg
- * core httpd -V - display the APR built, and running.
- http://svn.apache.org/viewcvs?rev=390573&view=rev
- +1: wrowe, pquerna, rooneg
-
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* mod_dbd: When threaded, create a private pool in child_init
Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/main.c?rev=390597&r1=390596&r2=390597&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Fri Mar 31 22:22:25 2006
@@ -20,6 +20,8 @@
#include "apr_general.h"
#include "apr_lib.h"
#include "apr_md5.h"
+#include "apr_version.h"
+#include "apu_version.h"
#define APR_WANT_STDIO
#define APR_WANT_STRFUNC
@@ -90,7 +92,10 @@
printf("Server built: %s\n", ap_get_server_built());
printf("Server's Module Magic Number: %u:%u\n",
MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
-
+ printf("Server loaded: APR %s, APR-Util %s\n",
+ apr_version_string(), apu_version_string());
+ printf("Compiled using: APR %s, APR-Util %s\n",
+ APR_VERSION_STRING, APU_VERSION_STRING);
/* sizeof(foo) is long on some platforms so we might as well
* make it long everywhere to keep the printf format
* consistent