update help text

Author: jpillora

README.md

@@ -116,10 +116,10 @@ $ chisel server --help
     chisel receives a normal HTTP request. Useful for hiding chisel in
     plain sight.
 
-    --socks5, Allows client to access the internal SOCKS5 proxy. See
+    --socks5, Allow clients to access the internal SOCKS5 proxy. See
     chisel client --help for more information.
 
-    --reverse, Allows client to specify reverse port forwarding remotes
+    --reverse, Allow clients to specify reverse port forwarding remotes
     in addition to normal remotes.
 
     --pid Generate pid file in current working directory
@@ -216,6 +216,9 @@ $ chisel client --help
     the chisel server. Authentication can be specified inside the URL.
     For example, http://admin:[email protected]:8081
 
+    --hostname, Optionally set the 'Host' header (defaults to the host
+    defined in the endpoint url).
+
     --pid Generate pid file in current working directory
 
     -v, Enable verbose logging

client/client.go

@@ -199,13 +199,13 @@ func (c *Client) connectionLoop() {
 				return c.httpProxyURL, nil
 			}
 		}
-		hostHeader := http.Header{}
-		if c.config.HostHeader == "" {
-			hostHeader = nil
-		} else {
-			hostHeader = http.Header{"Host": {c.config.HostHeader}}
+		wsHeaders := http.Header{}
+		if c.config.HostHeader != "" {
+			wsHeaders = http.Header{
+				"Host": {c.config.HostHeader},
+			}
 		}
-		wsConn, _, err := d.Dial(c.server, hostHeader)
+		wsConn, _, err := d.Dial(c.server, wsHeaders)
 		if err != nil {
 			connerr = err
 			continue

main.go

@@ -124,10 +124,10 @@ var serverHelp = `
     chisel receives a normal HTTP request. Useful for hiding chisel in
     plain sight.
 
-    --socks5, Allows client to access the internal SOCKS5 proxy. See
+    --socks5, Allow clients to access the internal SOCKS5 proxy. See
     chisel client --help for more information.
 
-    --reverse, Allows client to specify reverse port forwarding remotes
+    --reverse, Allow clients to specify reverse port forwarding remotes
     in addition to normal remotes.
 ` + commonHelp
 
@@ -264,7 +264,8 @@ var clientHelp = `
     the chisel server. Authentication can be specified inside the URL.
     For example, http://admin:[email protected]:8081
 
-    --hostname, An optional HOST header to send, can be left blank.
+    --hostname, Optionally set the 'Host' header (defaults to the host
+    found in the server url).
 ` + commonHelp
 
 func client(args []string) {