diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-10-20 08:52:31 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-10-20 08:52:31 -0200 |
| commit | b6feabc8c64377f621448a65564bdf33d0de6866 (patch) | |
| tree | 6280f8e13d8027809afd8183719c904714f3b46a | |
| parent | 33d377e7012865e1622e58886416653ec874dcd7 (diff) | |
| parent | fb38fdc7fd97f1e057b8c9d9102ce8a39b430f81 (diff) | |
| download | php-git-b6feabc8c64377f621448a65564bdf33d0de6866.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
| -rw-r--r-- | ext/ftp/ftp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 0d6704f9d2..58d3c2ec4d 100644 --- 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); } |