From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 1 Nov 2011 15:15:51 +0000 (+0000)
Subject: Fix bug 60183
X-Git-Tag: php-5.3.9RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09f8573a77e498348a405054b5c28bcecbb0a26f;p=php

Fix bug 60183
---

diff --git a/NEWS b/NEWS
index 9a998d47a9..e2ac9dcdb8 100644
--- 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 2ace44c8b7..d925c72f62 100644
--- 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;
 	}