diff options
| author | William Parsons | 2013-08-16 00:17:33 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-08-16 00:17:33 -0700 |
| commit | 4bbb43819fb6025ca15ec5eab7740dff38283d62 (patch) | |
| tree | f80c2b51835016ac1e42f7d1ea4ea8dfd12eb97b | |
| parent | e8bedf5a8836cdcb74b881eadba12564ca8de9ef (diff) | |
| download | emacs-4bbb43819fb6025ca15ec5eab7740dff38283d62.tar.gz emacs-4bbb43819fb6025ca15ec5eab7740dff38283d62.zip | |
* net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV (tiny change)
Fixes: debbugs:1972
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9e77d51c815..5edb462adb5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-16 William Parsons <wbparsons@alum.mit.edu> (tiny change) | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV. (Bug#1972) | ||
| 4 | |||
| 1 | 2013-08-16 Glenn Morris <rgm@gnu.org> | 5 | 2013-08-16 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd): | 7 | * net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd): |
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index b8e279be91b..17c532688ac 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el | |||
| @@ -723,7 +723,7 @@ parenthesized expressions in REGEXP for the components (in that order)." | |||
| 723 | "^504 Unknown security mechanism\\|" | 723 | "^504 Unknown security mechanism\\|" |
| 724 | "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd | 724 | "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd |
| 725 | "^534 Kerberos Authentication not enabled\\|" | 725 | "^534 Kerberos Authentication not enabled\\|" |
| 726 | "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT") | 726 | "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT\\|^500 .*EPSV") |
| 727 | "Regular expression matching FTP messages that can be ignored." | 727 | "Regular expression matching FTP messages that can be ignored." |
| 728 | :group 'ange-ftp | 728 | :group 'ange-ftp |
| 729 | :type 'regexp) | 729 | :type 'regexp) |