Browse code

Merge branch 'bugfix2.1' into beta2.2

David Sommerseth authored on 2010/11/13 08:49:05
Showing 2 changed files
... ...
@@ -3338,8 +3338,9 @@ exit/restart, this
3338 3338
 option will tell the server to immediately close its client instance object
3339 3339
 rather than waiting for a timeout.  The
3340 3340
 .B n
3341
-parameter (default=1) controls the maximum number of retries that the client
3342
-will attempt to resend the exit notification message.
3341
+parameter (default=1) controls the maximum number of attempts that the client
3342
+will try to resend the exit notification message.  OpenVPN will not send any exit
3343
+notifications unless this option is enabled.
3343 3344
 .\"*********************************************************
3344 3345
 .SS Data Channel Encryption Options:
3345 3346
 These options are meaningful for both Static & TLS-negotiated key modes
... ...
@@ -5311,12 +5312,12 @@ documentation for
5311 5311
 .\"*********************************************************
5312 5312
 .TP
5313 5313
 .B script_type
5314
-One of
5314
+Prior to execution of any script, this variable is set to the type of
5315
+script being run.  It can be one of the following:
5315 5316
 .B up, down, ipchange, route-up, tls-verify, auth-user-pass-verify,
5316 5317
 .B client-connect, client-disconnect, 
5317 5318
 or
5318 5319
 .B learn-address.
5319
-Set prior to execution of any script.
5320 5320
 .\"*********************************************************
5321 5321
 .TP
5322 5322
 .B signal
... ...
@@ -552,6 +552,10 @@ establish_http_proxy_passthru (struct http_proxy_info *p,
552 552
       if (!send_line_crlf (sd, buf))
553 553
 	goto error;
554 554
 
555
+      openvpn_snprintf(buf, sizeof(buf), "Host: %s", host);
556
+      if (!send_line_crlf(sd, buf))
557
+        goto error;
558
+
555 559
       /* send User-Agent string if provided */
556 560
       if (p->options.user_agent)
557 561
 	{