From 0206262850894be4ea4caff8aa849d21eae95ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 May 2020 04:40:58 +0200 Subject: [PATCH 1/2] Show debug connection settings after evaluating use-ssl Before this change we often showed http:// in debug log even when we later connect via https. This is confusing. Closes #139 --- ddclient | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ddclient b/ddclient index f390b7b..f9a3c70 100755 --- a/ddclient +++ b/ddclient @@ -1963,8 +1963,6 @@ sub geturl { my ($peer, $server, $port, $default_port, $use_ssl); my ($sd, $rq, $request, $reply); - debug("proxy = $proxy"); - debug("url = %s", $url); ## canonify proxy and url my $force_ssl; $force_ssl = 1 if ($url =~ /^https:/); @@ -1975,7 +1973,6 @@ sub geturl { $url = "/" unless $url =~ m%/%; $url =~ s%^[^/]*/%%; - debug("server = $server"); opt('fw') && debug("opt(fw = ", opt('fw'),")"); $globals{'fw'} && debug("glo fw = $globals{'fw'}"); ## always omit SSL for connections to local router @@ -1987,6 +1984,10 @@ sub geturl { $use_ssl = 0; $default_port = 80; } + debug("proxy = $proxy"); + debug("protocol = " . ($use_ssl ? "https" : "http")); + debug("server = $server"); + debug("url = %s", $url); ## determine peer and port to use. $peer = $proxy || $server; From 096288ed188d507851858b6f8dd6edbdddbc358c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 30 May 2020 04:42:27 +0200 Subject: [PATCH 2/2] Expand tabs to spaces in vim --- ddclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ddclient b/ddclient index f9a3c70..8491454 100755 --- a/ddclient +++ b/ddclient @@ -5027,7 +5027,7 @@ sub nic_dnsmadeeasy_update { } ###################################################################### -# vim: ai ts=4 sw=4 tw=78 : +# vim: ai et ts=4 sw=4 tw=78: __END__