[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 142397e: * lisp/net/ange-ftp.el (ange-ftp-skip-msgs
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 142397e: * lisp/net/ange-ftp.el (ange-ftp-skip-msgs): Further support ftp-ssl. |
Date: |
Wed, 16 Aug 2017 05:52:21 -0400 (EDT) |
branch: master
commit 142397e3a7f3c0164150f0bd9216c5722b272ce8
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
* lisp/net/ange-ftp.el (ange-ftp-skip-msgs): Further support ftp-ssl.
---
lisp/net/ange-ftp.el | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 0fbf825..80b8476 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -689,11 +689,17 @@ parenthesized expressions in REGEXP for the components
(in that order)."
;; authentication methods (typically) at connection establishment. Non
;; security-aware FTP servers should respond to this with a 500 code,
;; which we ignore.
+
+;; Further messages are needed to support ftp-ssl.
(defcustom ange-ftp-skip-msgs
(concat "^200 \\(PORT\\|Port\\) \\|^331 \\|^150 \\|^350 \\|^[0-9]+ bytes \\|"
"^Connected \\|^$\\|^Remote system\\|^Using\\|^ \\|Password:\\|"
"^Data connection \\|"
+ "^200 PBSZ\\|" "^200 Protection set to Private\\|"
+ "^234 AUTH TLS successful\\|"
"^SSL not available\\|"
+ "^\\[SSL Cipher .+\\]\\|"
+ "^\\[Encrypted data transfer\\.\\]\\|"
"^local:\\|^Trying\\|^125 \\|^550-\\|^221 .*oodbye\\|"
"^500 .*AUTH\\|^KERBEROS\\|"
"^500 This security scheme is not implemented\\|"
@@ -703,7 +709,7 @@ parenthesized expressions in REGEXP for the components (in
that order)."
"^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT\\|^500 .*EPSV")
"Regular expression matching FTP messages that can be ignored."
:group 'ange-ftp
- :version "24.4" ; add EPSV
+ :version "26.1"
:type 'regexp)
(defcustom ange-ftp-fatal-msgs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 142397e: * lisp/net/ange-ftp.el (ange-ftp-skip-msgs): Further support ftp-ssl.,
Michael Albinus <=