diff mbox

[FFmpeg-devel,2/2] avformat/ftp: allow nonstandard 202 reply to OPTS UTF8

Message ID 20181101200641.20816-2-cus@passwd.hu
State Accepted
Commit 8e5a2495a8dad262e0a00fbca09b7779b4ebf0bf
Headers show

Commit Message

Marton Balint Nov. 1, 2018, 8:06 p.m. UTC 
Fixes ticket #7481.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/ftp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Marton Balint Nov. 4, 2018, 10:04 p.m. UTC | #1 
On Thu, 1 Nov 2018, Marton Balint wrote:

> Fixes ticket #7481.
>
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavformat/ftp.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>

Applied and backported.

Regards,
Marton
diff mbox

Patch

diff --git a/libavformat/ftp.c b/libavformat/ftp.c
index 5063b7c204..e072067480 100644
--- a/libavformat/ftp.c
+++ b/libavformat/ftp.c
@@ -513,7 +513,7 @@  static int ftp_features(FTPContext *s)
     static const char *feat_command        = "FEAT\r\n";
     static const char *enable_utf8_command = "OPTS UTF8 ON\r\n";
     static const int feat_codes[] = {211, 0};
-    static const int opts_codes[] = {200, 451, 0};
+    static const int opts_codes[] = {200, 202, 451, 0};
 
     av_freep(&s->features);
     if (ftp_send_command(s, feat_command, feat_codes, &s->features) != 211) {
@@ -521,7 +521,8 @@  static int ftp_features(FTPContext *s)
     }
 
     if (ftp_has_feature(s, "UTF8")) {
-        if (ftp_send_command(s, enable_utf8_command, opts_codes, NULL) == 200)
+        int ret = ftp_send_command(s, enable_utf8_command, opts_codes, NULL);
+        if (ret == 200 || ret == 202)
             s->utf8 = 1;
     }