cvs: php-src(PHP_4_3) /ext/ftp ftp.c php_ftp.c

iliaa Thu Mar 10 18:38:18 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/ftp php_ftp.c ftp.c Log: MFH: Final set of fixes for bug #27633. http://cvs.php.net/diff.php/php-src/ext/ftp/php_ftp.c?r1=1.74.2.14&r2=1.74.2.15&ty=u Index: php-src/ext/ftp/php_ftp.c diff -u php-src/ext/ftp/php_ftp.c:1.74.2.14 php-src/ext/ftp/php_ftp.c:1.74.2.15 --- php-src/ext/ftp/php_ftp.c:1.74.2.14 Tue Nov 4 15:56:56 2003 +++ php-src/ext/ftp/php_ftp.c Thu Mar 10 18:38:18 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.74.2.14 2003/11/04 20:56:56 iliaa Exp $ */ +/* $Id: php_ftp.c,v 1.74.2.15 2005/03/10 23:38:18 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -602,6 +602,10 @@ RETURN_FALSE; } +#ifdef PHP_WIN32 + mode = FTPTYPE_IMAGE; +#endif + if (ftp->autoseek && resumepos) { if (PG(safe_mode) && (!php_checkuid(local, mode == FTPTYPE_ASCII ? "rt+" : "rb+", CHECKUID_CHECK_MODE_PARAM))) { RETURN_FALSE; http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.20&r2=1.68.2.21&ty=u Index: php-src/ext/ftp/ftp.c diff -u php-src/ext/ftp/ftp.c:1.68.2.20 php-src/ext/ftp/ftp.c:1.68.2.21 --- php-src/ext/ftp/ftp.c:1.68.2.20 Wed Mar 9 15:53:01 2005 +++ php-src/ext/ftp/ftp.c Thu Mar 10 18:38:18 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ftp.c,v 1.68.2.20 2005/03/09 20:53:01 iliaa Exp $ */ +/* $Id: ftp.c,v 1.68.2.21 2005/03/10 23:38:18 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -713,25 +713,8 @@ * 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));