Merge branch 'bugfix2.1' into beta2.2

2 files changed, 9 insertions, 4 deletions

diff --git a/openvpn.8 b/openvpn.8
index f97861e..298c79a 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -3338,8 +3338,9 @@ exit/restart, this
 option will tell the server to immediately close its client instance object
 rather than waiting for a timeout.  The
 .B n
-parameter (default=1) controls the maximum number of retries that the client
-will attempt to resend the exit notification message.
+parameter (default=1) controls the maximum number of attempts that the client
+will try to resend the exit notification message.  OpenVPN will not send any exit
+notifications unless this option is enabled.
 .\"*********************************************************
 .SS Data Channel Encryption Options:
 These options are meaningful for both Static & TLS-negotiated key modes
@@ -5311,12 +5312,12 @@ documentation for
 .\"*********************************************************
 .TP
 .B script_type
-One of
+Prior to execution of any script, this variable is set to the type of
+script being run.  It can be one of the following:
 .B up, down, ipchange, route-up, tls-verify, auth-user-pass-verify,
 .B client-connect, client-disconnect, 
 or
 .B learn-address.
-Set prior to execution of any script.
 .\"*********************************************************
 .TP
 .B signal
diff --git a/proxy.c b/proxy.c
index 3de2ac1..fce64a1 100644
--- a/proxy.c
+++ b/proxy.c
@@ -552,6 +552,10 @@ establish_http_proxy_passthru (struct http_proxy_info *p,
       if (!send_line_crlf (sd, buf))
 	goto error;
 
+      openvpn_snprintf(buf, sizeof(buf), "Host: %s", host);
+      if (!send_line_crlf(sd, buf))
+        goto error;
+
       /* send User-Agent string if provided */
       if (p->options.user_agent)
 	{