diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-03-10 23:37:45 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-03-10 23:37:45 +0000 |
| commit | ff80321587a3cfb0ee646ef2e952c08d00ca01a7 (patch) | |
| tree | a1aa9aace38c86c4e9d0d05053ac4bd2bb2fa6e3 /ext/ftp | |
| parent | e6034763ca9ab559e269a421a664ecac7ae4a769 (diff) | |
| download | php-git-ff80321587a3cfb0ee646ef2e952c08d00ca01a7.tar.gz | |
Final set of fixes for bug #27633.
# Many thanks to Edin for helpind analyze and resolve this bug.
Diffstat (limited to 'ext/ftp')
| -rw-r--r-- | ext/ftp/ftp.c | 21 | ||||
| -rw-r--r-- | ext/ftp/php_ftp.c | 8 |
2 files changed, 9 insertions, 20 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 01bbf3905b..8a229a17c6 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -846,25 +846,8 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, * Everything Else \n */ #ifdef PHP_WIN32 - while ((s = strpbrk(ptr, "\r\n")) && (s < e)) { - php_stream_write(outstream, ptr, (s - ptr)); - php_stream_write(outstream, "\r\n", sizeof("\r\n")-1); - - if (*s == '\r') { - s++; - } - /* for some reason some servers prefix a \r before a \n, - * resulting in a \r\r\n in the buffer when - * the remote file already has windoze style line endings. - */ - if (*s == '\r') { - s++; - } - if (*s == '\n') { - s++; - } - ptr = s; - } + php_stream_write(outstream, ptr, (e - ptr)); + ptr = e; #else while (e > ptr && (s = memchr(ptr, '\r', (e - ptr)))) { php_stream_write(outstream, ptr, (s - ptr)); diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index c527696c6b..4fa30ef738 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -679,6 +679,10 @@ PHP_FUNCTION(ftp_get) resumepos = 0; } +#ifdef PHP_WIN32 + mode = FTPTYPE_IMAGE; +#endif + if (ftp->autoseek && resumepos) { outstream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt+" : "rb+", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); if (outstream == NULL) { @@ -737,7 +741,9 @@ PHP_FUNCTION(ftp_nb_get) if (!ftp->autoseek && resumepos == PHP_FTP_AUTORESUME) { resumepos = 0; } - +#ifdef PHP_WIN32 + mode = FTPTYPE_IMAGE; +#endif if (ftp->autoseek && resumepos) { outstream = php_stream_open_wrapper(local, mode == FTPTYPE_ASCII ? "rt+" : "rb+", ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL); if (outstream == NULL) { |