Merge pull request #74 from chrislusf/master

sync

3 files changed, 5 insertions, 3 deletions

diff --git a/weed/util/constants.go b/weed/util/constants.go
index 908f782ae..1cd2f160a 100644
--- a/weed/util/constants.go
+++ b/weed/util/constants.go
@@ -5,7 +5,7 @@ import (
 )
 
 var (
-	VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 27)
+	VERSION = fmt.Sprintf("%s %d.%02d", sizeLimit, 2, 31)
 	COMMIT  = ""
 )
 
diff --git a/weed/util/fasthttp_util.go b/weed/util/fasthttp_util.go
index 82575af98..6c31a40da 100644
--- a/weed/util/fasthttp_util.go
+++ b/weed/util/fasthttp_util.go
@@ -18,6 +18,7 @@ var (
 		WriteTimeout:                  time.Second,
 		MaxIdleConnDuration:           time.Minute,
 		DisableHeaderNamesNormalizing: true, // If you set the case on your headers correctly you can enable this.
+		DialDualStack:                 true,
 	}
 
 	// Put everything in pools to prevent garbage.
diff --git a/weed/util/fla9/fla9.go b/weed/util/fla9/fla9.go
index 4a5884e9b..eb5700e8c 100644
--- a/weed/util/fla9/fla9.go
+++ b/weed/util/fla9/fla9.go
@@ -886,7 +886,7 @@ func (f *FlagSet) parseOne() (bool, error) {
 // The return value will be ErrHelp if -help or -h were set but not defined.
 func (f *FlagSet) Parse(arguments []string) error {
 	if _, ok := f.formal[DefaultConfigFlagName]; !ok {
-		f.String(DefaultConfigFlagName, "", "config file")
+		f.String(DefaultConfigFlagName, "", "a file of command line options, each line in optionName=optionValue format")
 	}
 
 	f.parsed = true
@@ -995,6 +995,7 @@ func NewFlagSet(name string, errorHandling ErrorHandling) *FlagSet {
 	f := &FlagSet{
 		name:          name,
 		errorHandling: errorHandling,
+		envPrefix:     EnvPrefix,
 	}
 	return f
 }
@@ -1078,7 +1079,7 @@ func NewFlagSetWithEnvPrefix(name string, prefix string, errorHandling ErrorHand
 // DefaultConfigFlagName defines the flag name of the optional config file
 // path. Used to lookup and parse the config file when a default is set and
 // available on disk.
-var DefaultConfigFlagName = "conf"
+var DefaultConfigFlagName = "options"
 
 // ParseFile parses flags from the file in path.
 // Same format as commandline arguments, newlines and lines beginning with a