Commit 5ea7da31 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

merge from trunk (but preserve ap_get_server_version()): 

  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now 
     deprecated, and is replaced by ap_get_server_banner() and 
     ap_get_server_description().

Reviewed by: rpluem, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68
parent 2202d2e5

CHANGES

+6 −0
Changes for CHANGES: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









  *) The full server version information is now included in the error log at









     startup as well as server status reports, irrespective of the setting









     of the ServerTokens directive.  ap_get_server_version() is now 









     deprecated, and is replaced by ap_get_server_banner() and 









     ap_get_server_description().  [Jeff Trawick]

















  *) mod_proxy_balancer: Workers can now be defined as part of









     a balancer cluster "set" in which members of a lower-numbered set









     are preferred over higher numbered ones. [Jim Jagielski]


































STATUS



+0
−4



























Changes for STATUS: 0 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -169,10 +169,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:







          (proxy_interpolatem, proxy_vars) which does not belong to the pingpong patch.



















    * full server version information in the error log at startup as well as server 









      status reports, regardless of ServerTokens









        http://people.apache.org/~trawick/banner-2.2.x-rev2.txt









      +1: trawick, rpluem, jim



















    * mod_proxy_balancer: Extract stickysession routing information contained as









      parameter in the URL correctly.









        PR: 40400


































include/ap_mmn.h



+3
−1



























Changes for include/ap_mmn.h: 3 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -111,6 +111,8 @@







 *                         proxy_server (minor)









 * 20051115.2 (2.2.2)  added inreslist member to proxy_conn_rec (minor)









 * 20051115.3 (2.2.3)  Added server_scheme member to server_rec (minor)









 * 20051115.4 (2.2.4)  Added ap_get_server_banner() and









 *                         ap_get_server_description() (minor)









 */



















#define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */










@@ -118,7 +120,7 @@







#ifndef MODULE_MAGIC_NUMBER_MAJOR









#define MODULE_MAGIC_NUMBER_MAJOR 20051115









#endif









#define MODULE_MAGIC_NUMBER_MINOR 3                     /* 0...n */









#define MODULE_MAGIC_NUMBER_MINOR 4                     /* 0...n */



















/**









 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a


































include/httpd.h



+22
−2



























Changes for include/httpd.h: 22 added lines, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -420,13 +420,33 @@ typedef struct {







AP_DECLARE(void) ap_get_server_revision(ap_version_t *version);



















/**









 * Get the server version string









 * Get the server version string, as controlled by the ServerTokens directive









 * @return The server version string









 * @deprecated @see ap_get_server_banner() and ap_get_server_description()









 */









AP_DECLARE(const char *) ap_get_server_version(void);



















/**









 * Add a component to the version string









 * Get the server banner in a form suitable for sending over the









 * network, with the level of information controlled by the









 * ServerTokens directive.









 * @return The server banner









 */









AP_DECLARE(const char *) ap_get_server_banner(void);



















/**









 * Get the server description in a form suitable for local displays,









 * status reports, or logging.  This includes the detailed server









 * version and information about some modules.  It is not affected









 * by the ServerTokens directive.









 * @return The server description









 */









AP_DECLARE(const char *) ap_get_server_description(void);



















/**









 * Add a component to the server description and banner strings









 * (The latter is returned by the deprecated function









 * ap_get_server_version().)









 * @param pconf The pool to allocate the component from









 * @param component The string to add









 */


































modules/arch/netware/mod_nw_ssl.c



+1
−1



























Changes for modules/arch/netware/mod_nw_ssl.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1074,7 +1074,7 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r,







            /* XXX-Can't get specific SSL info from NetWare */









            /*result = ssl_var_lookup_ssl_version(p, var+12);*/









        else if (strcEQ(var, "SERVER_SOFTWARE"))









            result = ap_get_server_version();









            result = ap_get_server_banner();









        else if (strcEQ(var, "API_VERSION")) {









            result = apr_itoa(p, MODULE_MAGIC_NUMBER);









            resdup = FALSE;