Fix --no-proxy option

A missing break in the case statement meant that --no-proxy would not disable
the proxy at all; it would actually have the same effect as --libproxy.

This bug has been present since the --no-proxy option was first added in
v2.20 (commit 9c6d3f1b). Although it was falling through to the --script
option then.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/main.c b/main.c
index 27388663cc08c98ebee01cc4a50fdcaf9708170e..e65b3569df0aabf0779e9ce332d1502cef6f5c55 100644 (file)
--- a/main.c
+++ b/main.c
@@ -599,6 +599,7 @@ int main(int argc, char **argv)
                case OPT_NO_PROXY:
                        autoproxy = 0;
                        proxy = NULL;
+                       break;
                case OPT_LIBPROXY:
                        autoproxy = 1;
                        proxy = NULL;

diff --git a/www/changelog.xml b/www/changelog.xml
index bb45fe454308988fff29c2afb6176a1178221b03..9c77b0742a72436d0c62f6e93644043e51839ecb 100644 (file)
--- a/www/changelog.xml
+++ b/www/changelog.xml
@@ -17,6 +17,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
+       <li>Fix <tt>--no-proxy</tt> option.</li>
        <li>Fix handling of requested vs. received MTU settings.</li>
        <li>Fix DTLS MTU for GnuTLS 3.0.21 and newer.</li>
        <li>Support more ciphers for OpenSSL encrypted PEM keys, with GnuTLS.</li>