From: plugd <plugd@thelambdalab.xyz>
Date: Mon, 2 Aug 2021 09:38:42 +0000 (+0200)
Subject: Bug fix: elpher-ipv4-only wasn't being respected.
X-Git-Tag: v3.2.1~1
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=a7145a60ee4ba9699cfb2080ab6e96d1ab64f722;p=elpher.git

Bug fix: elpher-ipv4-only wasn't being respected.
---

diff --git a/elpher.el b/elpher.el
index 0e33295..b4e508a 100644
--- a/elpher.el
+++ b/elpher.el
@@ -773,7 +773,7 @@ the host operating system and the local network capabilities.)"
                                      (elpher-process-cleanup)
                                      (cond
                                         ; Try again with IPv4
-                                      ((not (or force-ipv4 socks))
+                                      ((not (or elpher-ipv4-always force-ipv4 socks))
                                        (message "Connection timed out.  Retrying with IPv4.")
                                        (elpher-get-host-response address default-port
                                                                  query-string
@@ -794,7 +794,9 @@ the host operating system and the local network capabilities.)"
                (proc (if socks (socks-open-network-stream "elpher-process" nil host service)
                        (make-network-process :name "elpher-process"
                                              :host host
-                                             :family (and force-ipv4 'ipv4)
+                                             :family (and (or force-ipv4
+                                                              elpher-ipv4-always)
+                                                          'ipv4)
                                              :service service
                                              :buffer nil
                                              :nowait t