cvs: /php3 ChangeLog fopen-wrappers.c

thies Thu Nov 11 08:46:52 1999 EDT Modified files: /php3 ChangeLog fopen-wrappers.c Log: fixed internal ftp-wrapper to be RFC compatible (else we won't be able to talk to VMS) Index: php3/ChangeLog diff -u php3/ChangeLog:1.789 php3/ChangeLog:1.790 --- php3/ChangeLog:1.789 Wed Nov 10 14:54:11 1999 +++ php3/ChangeLog Thu Nov 11 08:46:50 1999 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| Nov 15, 1999, Version 3.0.13 +- RFC-854 fix for internal FTP-Code. Commands have to end in "\r\n" (Thies) - GD-1.7.x detection (Rasmus) - added patch to functions/mime.c so that form submit with lynx and old IE works properly (closes bug #2362, code by ash@ash.de) Index: php3/fopen-wrappers.c diff -u php3/fopen-wrappers.c:1.74 php3/fopen-wrappers.c:1.75 --- php3/fopen-wrappers.c:1.74 Thu Oct 14 17:30:26 1999 +++ php3/fopen-wrappers.c Thu Nov 11 08:46:51 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.74 1999/10/14 21:30:26 fmk Exp $ */ +/* $Id: fopen-wrappers.c,v 1.75 1999/11/11 13:46:51 thies Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -717,7 +717,7 @@ } else { SOCK_WRITE("anonymous", *socketd); } - SOCK_WRITE("\n", *socketd); + SOCK_WRITE("\r\n", *socketd); /* get the response */ result = _php3_getftpresult(*socketd); @@ -737,7 +737,7 @@ SOCK_WRITE("anonymous", *socketd); } } - SOCK_WRITE("\n", *socketd); + SOCK_WRITE("\r\n", *socketd); /* read the response */ result = _php3_getftpresult(*socketd); @@ -755,7 +755,7 @@ } /* set the connection to be binary */ - SOCK_WRITE("TYPE I\n", *socketd); + SOCK_WRITE("TYPE I\r\n", *socketd); result = _php3_getftpresult(*socketd); if (result > 299 || result < 200) { free_url(resource); @@ -767,7 +767,7 @@ /* find out the size of the file (verifying it exists) */ SOCK_WRITE("SIZE ", *socketd); SOCK_WRITE(resource->path, *socketd); - SOCK_WRITE("\n", *socketd); + SOCK_WRITE("\r\n", *socketd); /* read the response */ result = _php3_getftpresult(*socketd); @@ -794,7 +794,7 @@ } /* set up the passive connection */ - SOCK_WRITE("PASV\n", *socketd); + SOCK_WRITE("PASV\r\n", *socketd); while (SOCK_FGETS(tmp_line, sizeof(tmp_line), *socketd) && !(isdigit((int) tmp_line[0]) && isdigit((int) tmp_line[1]) && isdigit((int) tmp_line[2]) && tmp_line[3] == ' ')); @@ -873,7 +873,7 @@ } /* close control connection */ - SOCK_WRITE("\nQUIT\n", *socketd); + SOCK_WRITE("\r\nQUIT\r\n", *socketd); SOCK_FCLOSE(*socketd); /* open the data channel */