Commit 1dcacb2b authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Backport httpd -V status display of compiled/loaded apr[-util] versions.

Backports: 390573


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@393654 13f79535-47bb-0310-9956-ffa450edef68
parent 841a66c4

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ Changes with Apache 2.0.56 
     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.

































STATUS



+1
−3






























Original line number
Diff line number
Diff line








@@ -112,9 +112,6 @@ RELEASE SHOWSTOPPERS:













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 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:













        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

































server/main.c



+6
−1






























Original line number
Diff line number
Diff line








@@ -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 @@ static void show_compile_settings(void)













    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