diff options
| author | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:47 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2010-10-21 08:52:47 +0200 |
| commit | 931ef23e1a9a93ad1d923f3fda90e94c32b669f2 (patch) | |
| tree | 34d9dc3692f15294c9d0f695d916da1829207b6a /ext/ftp/ftp.c | |
| parent | 8339968ab21da25d85612e1d6209cf3608a66828 (diff) | |
| parent | 01fcdff3849c3691d9aaeaab735846ab6d8895ca (diff) | |
| download | php-931ef23e1a9a93ad1d923f3fda90e94c32b669f2.tar.gz | |
Merge branch 'upstream-sid' into debian-sid
Diffstat (limited to 'ext/ftp/ftp.c')
| -rw-r--r-- | ext/ftp/ftp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index be6c03f8a..1a64040e9 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.c 293036 2010-01-03 09:23:27Z sebastian $ */ +/* $Id: ftp.c 295820 2010-03-04 12:52:58Z iliaa $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -948,7 +948,7 @@ ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, i } ftp->data = data = data_close(ftp, data); - if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250)) { + if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250 && ftp->resp != 200)) { goto bail; } return 1; |