diff --git a/ChangeLog.md b/ChangeLog.md index 142cf2c..5a5ad5f 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -28,6 +28,7 @@ repository history](https://github.com/ddclient/ddclient/commits/master). * Fixed a regression introduced in v3.9.0 that caused `use=ip,ip=` to fail. * "true" is now accepted as a boolean value. + * The `ssl` option now applies to the `web` URL. ### Compatibility and dependency changes diff --git a/ddclient.in b/ddclient.in index 41bac06..c2a25da 100755 --- a/ddclient.in +++ b/ddclient.in @@ -1986,8 +1986,7 @@ sub geturl { opt('fw') && debug("opt(fw = %s)", opt('fw')); $globals{'fw'} && debug("glo fw = %s", $globals{'fw'}); - ## always omit SSL for connections to local router - if ($force_ssl || ($globals{'ssl'} && ((caller(1))[3] // '') ne 'main::get_ip')) { + if ($force_ssl || ($globals{'ssl'} && !($params->{ignore_ssl_option} // 0))) { $use_ssl = 1; $default_port = '443'; } else { @@ -2188,6 +2187,7 @@ sub get_ip { url => $url, login => opt('fw-login', $h), password => opt('fw-password', $h), + ignore_ssl_option => 1, }) || ''; $arg = $url; @@ -2209,6 +2209,7 @@ sub get_ip { url => $url, login => opt('fw-login', $h), password => opt('fw-password', $h), + ignore_ssl_option => 1, }) || ''; $arg = $url; @@ -2227,6 +2228,7 @@ sub get_ip { url => $url, login => opt('fw-login', $h), password => opt('fw-password', $h), + ignore_ssl_option => 1, }) || ''; } }