From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 18 Mar 2004 17:15:47 +0000 (+0000)
Subject: MFH: Fixed bug #27633 (Incorrect EOL translation by ftp_get() in ASCII
X-Git-Tag: php-4.3.5RC4~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663841fd31e5dd19661deb20fa6949ab74750d4a;p=php

MFH: Fixed bug #27633 (Incorrect EOL translation by ftp_get() in ASCII
mode).
---

diff --git a/NEWS b/NEWS
index 7838c7b61e..475a49ac87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Feb 2004, Version 4.3.5
+18 Mar 2004, Version 4.3.5RC4
 - Fixed possible crash using an invalid color index with a palette image in
   imagecolortransparent (Pierre)
 - Fixed php-cgi to not ignore command-line switches when run in a web context.
@@ -10,7 +10,9 @@ PHP 4                                                                      NEWS
   actually parsed. (Jon)
 - Fixed possible crashes inside socket extension, due to missing check inside
   allocation functions. (Ilia)
-- Fixed bug #27600 (GCC 3.0.4 does not like __attribute__ directive). (Ilia)
+- Fixed bug #27633 (Incorrect EOL translation by ftp_get() in ASCII mode).
+  (Ilia)
+- Fixed bug #27600 (GCC 3.0.4 does not like __attribute__ directive). (Sascha)
 - Fixed bug #27590 (crash during shutdown when freeing persistent resources
   in ZTS mode). (Ilia)
 - Fixed bug #27582 (possible crashes in imagefilltoborder()). (Pierre)
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 9d3468015a..89aa74f03d 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -652,7 +652,6 @@ int
 ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int resumepos)
 {
 	databuf_t		*data = NULL;
-	char			*ptr;
 	int			lastch;
 	size_t			rcvd;
 	char			arg[11];
@@ -703,12 +702,39 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type,
 		}
 
 		if (type == FTPTYPE_ASCII) {
-			for (ptr = data->buf; rcvd; rcvd--, ptr++) {
-				if (lastch == '\r' && *ptr != '\n')
+			char *s;
+			char *ptr = data->buf;
+			char *e = ptr + rcvd;
+			/* logic depends on the OS EOL
+			 * Win32 -> \r\n
+			 * Everything Else \n
+			 */
+#ifdef PHP_WIN32
+			while ((s = strpbrk(ptr, "\r\n"))) {
+				if (*s == '\n') {
 					php_stream_putc(outstream, '\r');
-				if (*ptr != '\r')
-					php_stream_putc(outstream, *ptr);
-				lastch = *ptr;
+				} else if (*s == '\r' && *(s + 1) == '\n') {
+					s++;
+				}
+				s++;
+				php_stream_write(outstream, ptr, (s - ptr));
+				if (*(s - 1) == '\r') {
+					php_stream_putc(outstream, '\n');
+				}
+				ptr = s;
+			}
+#else 
+			while ((s = memchr(ptr, '\r', (e - ptr)))) {
+				php_stream_write(outstream, ptr, (s - ptr));
+				if (*(s + 1) == '\n') {
+					s++;
+				}
+				php_stream_putc(outstream, '\n');
+				ptr = s + 1;
+			}
+#endif
+			if (ptr < e) {
+				php_stream_write(outstream, ptr, (e - ptr));
 			}
 		}
 		else {
@@ -717,9 +743,6 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type,
 		}
 	}
 
-	if (type == FTPTYPE_ASCII && lastch == '\r')
-		php_stream_putc(outstream, '\r');
-
 	ftp->data = data = data_close(ftp, data);
 
 	if (!ftp_getresp(ftp) || (ftp->resp != 226 && ftp->resp != 250)) {