[master] b2065e8 listen to *:80 by default as documented in varnishd.rst

Nils Goroll nils.goroll at uplex.de
Thu May 28 14:03:50 CEST 2015


commit b2065e8bc203ac9720d61cc1ee63dd749541d329
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu May 28 13:48:19 2015 +0200

    listen to *:80 by default as documented in varnishd.rst

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 16ef14b..eafdcb6 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -141,7 +141,8 @@ usage(void)
 #define FMT "    %-28s # %s\n"
 
 	fprintf(stderr, "usage: varnishd [options]\n");
-	fprintf(stderr, FMT, "-a address:port", "HTTP listen address and port");
+	fprintf(stderr, FMT, "-a address:port", "HTTP listen address and port"
+	    " (default: *:80)");
 	fprintf(stderr, FMT, "-b address:port", "backend address and port");
 	fprintf(stderr, FMT, "", "   -b <hostname_or_IP>");
 	fprintf(stderr, FMT, "", "   -b '<hostname_or_IP>:<port_or_service>'");
@@ -708,7 +709,9 @@ main(int argc, char * const *argv)
 		ARGV_ERR("-C only good with -b or -f\n");
 
 	if (VTAILQ_EMPTY(&heritage.socks))
-		ARGV_ERR("Need -a argument(s)\n");
+		MAC_Arg("*:80");
+
+	assert(! VTAILQ_EMPTY(&heritage.socks));
 
 	if (!d_flag) {
 		if (b_arg == NULL && f_arg == NULL) {



More information about the varnish-commit mailing list