diff options
| author | Jeff Trawick <trawick@apache.org> | 2006-09-05 15:08:15 +0200 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2006-09-05 15:08:15 +0200 |
| commit | 743a621e8d97c218c829cb603a3fbde265406ed8 (patch) | |
| tree | 4ec6ec328ab5551cfa2e9f2e4b8e0d2a651b9fd4 /server/mpm/netware | |
| parent | * Extract stickysession information correctly in the case that it is given (diff) | |
| download | apache2-743a621e8d97c218c829cb603a3fbde265406ed8.tar.xz apache2-743a621e8d97c218c829cb603a3fbde265406ed8.zip | |
Replace ap_get_server_version with ap_get_server_banner() and
ap_get_server_description().
High-level summary:
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.
Third-party modules must now use ap_get_server_banner() or
ap_get_server_description() in place of ap_get_server_version().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/netware')
| -rw-r--r-- | server/mpm/netware/mpm_netware.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index f116d2b000..54d7960452 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -723,7 +723,7 @@ static void display_settings () request_count = 0; ClearScreen (getscreenhandle()); - printf("%s \n", ap_get_server_version()); + printf("%s \n", ap_get_server_description()); for (i=0;i<SERVER_NUM_STATUS;i++) { status_array[i] = 0; @@ -793,7 +793,7 @@ static void show_server_data() ap_listen_rec *lr; module **m; - printf("%s\n", ap_get_server_version()); + printf("%s\n", ap_get_server_description()); if (ap_my_addrspace && (ap_my_addrspace[0] != 'O') && (ap_my_addrspace[1] != 'S')) printf(" Running in address space %s\n", ap_my_addrspace); @@ -899,7 +899,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, "%s configured -- resuming normal operations", - ap_get_server_version()); + ap_get_server_description()); ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, "Server built: %s", ap_get_server_built()); #ifdef AP_MPM_WANT_SET_ACCEPT_LOCK_MECH @@ -1204,7 +1204,7 @@ static int CommandLineInterpreter(scr_t screenID, const char *commandLine) restart(); } else if (!strnicmp("VERSION",&szcommandLine[iCommandLen],3)) { - printf("Server version: %s\n", ap_get_server_version()); + printf("Server version: %s\n", ap_get_server_description()); printf("Server built: %s\n", ap_get_server_built()); } else if (!strnicmp("MODULES",&szcommandLine[iCommandLen],3)) { |