Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

php · Oct 20, 2013 · b6feabc · b6feabc
2 parents 33d377e + fb38fdc
commit b6feabc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
@@ -630,7 +630,7 @@ ftp_alloc(ftpbuf_t *ftp, const long size, char **response)
 		return 0;
 	}
 
-	if (response && ftp->inbuf) {
+	if (response) {
 		*response = estrdup(ftp->inbuf);
 	}