cvs: php-src(PHP_4_3) /ext/ftp ftp.c
| From: | Ilia Alshanetsky | Date: | Wed, 09 Mar 2005 20:53:01 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/ftp ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30808@lists.php.net to get a copy of this message | ||
iliaa Wed Mar 9 15:53:01 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ftp ftp.c
Log:
MFH: Fixes to ascii downloads on win32.
http://cvs.php.net/diff.php/php-src/ext/ftp/ftp.c?r1=1.68.2.19&r2=1.68.2.20&ty=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.19 php-src/ext/ftp/ftp.c:1.68.2.20
--- php-src/ext/ftp/ftp.c:1.68.2.19 Thu Feb 17 10:38:34 2005
+++ php-src/ext/ftp/ftp.c Wed Mar 9 15:53:01 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.68.2.19 2005/02/17 15:38:34 iliaa Exp $ */
+/* $Id: ftp.c,v 1.68.2.20 2005/03/09 20:53:01 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -718,17 +718,17 @@
php_stream_write(outstream, "\r\n", sizeof("\r\n")-1);
if (*s == '\r') {
- *s++;
+ 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++;
+ s++;
}
if (*s == '\n') {
- *s++;
+ s++;
}
ptr = s;
}