You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2006/04/13 01:19:05 UTC
svn commit: r393654 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
server/main.c
Author: wrowe
Date: Wed Apr 12 16:19:02 2006
New Revision: 393654
URL: http://svn.apache.org/viewcvs?rev=393654&view=rev
Log:
Backport httpd -V status display of compiled/loaded apr[-util] versions.
Backports: 390573
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/server/main.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=393654&r1=393653&r2=393654&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Wed Apr 12 16:19:02 2006
@@ -14,6 +14,9 @@
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]
+
*) Ensure that the proper status line is written to the client, fixing
incorrect status lines caused by filters which modify r->status without
resetting r->status_line, such as the built-in byterange filter.
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=393654&r1=393653&r2=393654&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Wed Apr 12 16:19:02 2006
@@ -112,9 +112,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) core httpd -V - display the APR built, and running.
- http://svn.apache.org/viewcvs?rev=390573&view=rev
- +1: wrowe, trawick, rpluem
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ please place SVN revisions from trunk here, so it is easy to
@@ -126,6 +123,7 @@
http://people.apache.org/~colm/httpd-2.0-reverse-proxy-cookie.patch
and is in production with Clients.
+1: niq
+ +0: looks good, but there's no way to apply this without a minor bump
*) mod_cgid: Fix PR 36410. Invoke the set_suexec_identity hook from
the non-cgid side of the handler, where the full per-server/dir/etc
Modified: httpd/httpd/branches/2.0.x/server/main.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/main.c?rev=393654&r1=393653&r2=393654&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/main.c (original)
+++ httpd/httpd/branches/2.0.x/server/main.c Wed Apr 12 16:19:02 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
@@ -50,7 +52,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