Fix bug 60183

diff --git a/NEWS b/NEWS
index 9a998d47a979c8e59d90cacf539f534e67d73195..e2ac9dcdb8886ff5b182e127ec21446d52a9dc88 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -131,6 +131,9 @@ PHP                                                                        NEWS
 - Fileinfo:
   . Fixed bug #60094 (C++ comment fails in c89). (Laruence)
 
+- FTP:
+  . Fixed bug #60183 (out of sync ftp responses). (bram at ebskamp dot me, rasmus)
+
 
 23 Aug 2011, PHP 5.3.8
 

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 2ace44c8b7137eb63640166ff3499ca40334d42a..d925c72f62d982b88e3cdcc0758f7fe655466c6e 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -1122,6 +1122,9 @@ ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const char *args)
 
        data = ftp->outbuf;
 
+       /* Clear the extra-lines buffer */
+       ftp->extra = NULL;
+
        if (my_send(ftp, ftp->fd, data, size) != size) {
                return 0;
        }