From: Amos Jeffries Date: Sun, 5 Feb 2017 17:20:04 +0000 (+1300) Subject: Re-enable https:// URL handling after merges X-Git-Tag: M-staged-PR71~257^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40f384386bcf52744d1b153b6229c3d334b900ef;p=thirdparty%2Fsquid.git Re-enable https:// URL handling after merges --- diff --git a/src/url.cc b/src/url.cc index 56c7854e55..eaa3f11375 100644 --- a/src/url.cc +++ b/src/url.cc @@ -830,7 +830,7 @@ urlCheckRequest(const HttpRequest * r) break; case AnyP::PROTO_HTTPS: -#if USE_OPENSSL +#if USE_OPENSSL || USE_GNUTLS rc = 1; #else /*