diff options
author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-03-30 09:54:20 +0000 |
---|---|---|
committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-03-30 09:54:20 +0000 |
commit | a16d8dfba28d5349220e7ce8eb879f7d7519810b (patch) | |
tree | 66b390a9fc1a95eb54b3fdc54269b9e51bfa8fcf | |
parent | fbfc16cf1a4a535a78e5d17ac58ba5d93aff384e (diff) |
Restore full version reporting when using the -v and -V switch.
This unbreaks some configuration scripts.
ok henning@, xsa@, espie@
-rw-r--r-- | usr.sbin/httpd/src/main/http_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c index 76048076b81..ee2059e38e6 100644 --- a/usr.sbin/httpd/src/main/http_main.c +++ b/usr.sbin/httpd/src/main/http_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http_main.c,v 1.46 2007/03/22 20:08:18 pyr Exp $ */ +/* $OpenBSD: http_main.c,v 1.47 2007/03/30 09:54:19 pyr Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 @@ -3224,10 +3224,12 @@ int REALMAIN(int argc, char *argv[]) ap_cpystrn(ap_server_confname, optarg, sizeof(ap_server_confname)); break; case 'v': + ap_server_tokens = SrvTk_FULL; ap_set_version(); printf("Server version: %s\n", ap_get_server_version()); exit(0); case 'V': + ap_server_tokens = SrvTk_FULL; ap_set_version(); show_compile_settings(); exit(0); |