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

felipensp · felipensp · commit b6feabc8c643 · 2013-10-20T08:52:31.000-02:00
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);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ ftp_alloc(ftpbuf_t ftp, const long size, char *response)`
`630`	`630`	`return 0;`
`631`	`631`	`}`
`632`	`632`
`633`		`- if (response && ftp->inbuf) {`
	`633`	`+ if (response) {`
`634`	`634`	`*response = estrdup(ftp->inbuf);`
`635`	`635`	`}`
`636`	`636`