archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make transfer mode optional, set default to binary

Browse source
This commit is contained in:
Andreas Treichel 2017-07-10 18:13:58 +02:00 • committed by Joe Watkins
parent 5058ba6c22
commit 00cd671233
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
4 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
UPGRADING
View file

@ -56,6 +56,9 @@ Core:
9. Other Changes to Extensions 9. Other Changes to Extensions
======================================== ========================================
FTP:
. Set default transfer mode to binary
ODBC: ODBC:
. Support for Birdstep has been removed. . Support for Birdstep has been removed.

48
ext/ftp/php_ftp.c
View file

@ -816,7 +816,7 @@ PHP_FUNCTION(ftp_systype)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_fget(resource stream, resource fp, string remote_file, int mode[, int resumepos]) /* {{{ proto bool ftp_fget(resource stream, resource fp, string remote_file, [, int mode [, int resumepos]])
Retrieves a file from the FTP server and writes it to an open file */ Retrieves a file from the FTP server and writes it to an open file */
PHP_FUNCTION(ftp_fget) PHP_FUNCTION(ftp_fget)
{ {
@ -826,9 +826,9 @@ PHP_FUNCTION(ftp_fget)
php_stream *stream; php_stream *stream;
char *file; char *file;
size_t file_len; size_t file_len;
zend_long mode, resumepos=0; zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
return; return;
} }
@ -862,7 +862,7 @@ PHP_FUNCTION(ftp_fget)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_fget(resource stream, resource fp, string remote_file, int mode[, int resumepos]) /* {{{ proto int ftp_nb_fget(resource stream, resource fp, string remote_file [, int mode [, int resumepos]])
Retrieves a file from the FTP server asynchronly and writes it to an open file */ Retrieves a file from the FTP server asynchronly and writes it to an open file */
PHP_FUNCTION(ftp_nb_fget) PHP_FUNCTION(ftp_nb_fget)
{ {
@ -872,9 +872,9 @@ PHP_FUNCTION(ftp_nb_fget)
php_stream *stream; php_stream *stream;
char *file; char *file;
size_t file_len; size_t file_len;
zend_long mode, resumepos=0, ret; zend_long mode=FTPTYPE_IMAGE, resumepos=0, ret;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rrs|ll", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
return; return;
} }
@ -936,7 +936,7 @@ PHP_FUNCTION(ftp_pasv)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_get(resource stream, string local_file, string remote_file, int mode[, int resume_pos]) /* {{{ proto bool ftp_get(resource stream, string local_file, string remote_file [, int mode [, int resume_pos]])
Retrieves a file from the FTP server and writes it to a local file */ Retrieves a file from the FTP server and writes it to a local file */
PHP_FUNCTION(ftp_get) PHP_FUNCTION(ftp_get)
{ {
@ -946,9 +946,9 @@ PHP_FUNCTION(ftp_get)
php_stream *outstream; php_stream *outstream;
char *local, *remote; char *local, *remote;
size_t local_len, remote_len; size_t local_len, remote_len;
zend_long mode, resumepos=0; zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
return; return;
} }
@ -1001,7 +1001,7 @@ PHP_FUNCTION(ftp_get)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_get(resource stream, string local_file, string remote_file, int mode[, int resume_pos]) /* {{{ proto int ftp_nb_get(resource stream, string local_file, string remote_file, [, int mode [, int resume_pos]])
Retrieves a file from the FTP server nbhronly and writes it to a local file */ Retrieves a file from the FTP server nbhronly and writes it to a local file */
PHP_FUNCTION(ftp_nb_get) PHP_FUNCTION(ftp_nb_get)
{ {
@ -1012,9 +1012,9 @@ PHP_FUNCTION(ftp_nb_get)
char *local, *remote; char *local, *remote;
size_t local_len, remote_len; size_t local_len, remote_len;
int ret; int ret;
zend_long mode, resumepos=0; zend_long mode=FTPTYPE_IMAGE, resumepos=0;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rssl|l", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rss|ll", &z_ftp, &local, &local_len, &remote, &remote_len, &mode, &resumepos) == FAILURE) {
return; return;
} }
@ -1114,7 +1114,7 @@ PHP_FUNCTION(ftp_nb_continue)
} }
/* }}} */ /* }}} */
/* {{{ proto bool ftp_fput(resource stream, string remote_file, resource fp, int mode[, int startpos]) /* {{{ proto bool ftp_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]])
Stores a file from an open file to the FTP server */ Stores a file from an open file to the FTP server */
PHP_FUNCTION(ftp_fput) PHP_FUNCTION(ftp_fput)
{ {
@ -1122,11 +1122,11 @@ PHP_FUNCTION(ftp_fput)
ftpbuf_t *ftp; ftpbuf_t *ftp;
ftptype_t xtype; ftptype_t xtype;
size_t remote_len; size_t remote_len;
zend_long mode, startpos=0; zend_long mode=FTPTYPE_IMAGE, startpos=0;
php_stream *stream; php_stream *stream;
char *remote; char *remote;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
return; return;
} }
@ -1163,7 +1163,7 @@ PHP_FUNCTION(ftp_fput)
} }
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_fput(resource stream, string remote_file, resource fp, int mode[, int startpos]) /* {{{ proto int ftp_nb_fput(resource stream, string remote_file, resource fp [, int mode [, int startpos]])
Stores a file from an open file to the FTP server nbronly */ Stores a file from an open file to the FTP server nbronly */
PHP_FUNCTION(ftp_nb_fput) PHP_FUNCTION(ftp_nb_fput)
{ {
@ -1172,11 +1172,11 @@ PHP_FUNCTION(ftp_nb_fput)
ftptype_t xtype; ftptype_t xtype;
size_t remote_len; size_t remote_len;
int ret; int ret;
zend_long mode, startpos=0; zend_long mode=FTPTYPE_IMAGE, startpos=0;
php_stream *stream; php_stream *stream;
char *remote; char *remote;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsrl|l", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsr|ll", &z_ftp, &remote, &remote_len, &z_file, &mode, &startpos) == FAILURE) {
return; return;
} }
@ -1218,7 +1218,7 @@ PHP_FUNCTION(ftp_nb_fput)
/* }}} */ /* }}} */
/* {{{ proto bool ftp_put(resource stream, string remote_file, string local_file, int mode[, int startpos]) /* {{{ proto bool ftp_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]])
Stores a file on the FTP server */ Stores a file on the FTP server */
PHP_FUNCTION(ftp_put) PHP_FUNCTION(ftp_put)
{ {
@ -1227,10 +1227,10 @@ PHP_FUNCTION(ftp_put)
ftptype_t xtype; ftptype_t xtype;
char *remote, *local; char *remote, *local;
size_t remote_len, local_len; size_t remote_len, local_len;
zend_long mode, startpos=0; zend_long mode=FTPTYPE_IMAGE, startpos=0;
php_stream *instream; php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
return; return;
} }
@ -1273,7 +1273,7 @@ PHP_FUNCTION(ftp_put)
/* }}} */ /* }}} */
/* {{{ proto int ftp_nb_put(resource stream, string remote_file, string local_file, int mode[, int startpos]) /* {{{ proto int ftp_nb_put(resource stream, string remote_file, string local_file [, int mode [, int startpos]])
Stores a file on the FTP server */ Stores a file on the FTP server */
PHP_FUNCTION(ftp_nb_put) PHP_FUNCTION(ftp_nb_put)
{ {
@ -1282,10 +1282,10 @@ PHP_FUNCTION(ftp_nb_put)
ftptype_t xtype; ftptype_t xtype;
char *remote, *local; char *remote, *local;
size_t remote_len, local_len; size_t remote_len, local_len;
zend_long mode, startpos=0, ret; zend_long mode=FTPTYPE_IMAGE, startpos=0, ret;
php_stream *instream; php_stream *instream;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS(), "rpp|ll", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
return; return;
} }

20
ext/ftp/tests/004.phpt
View file

@ -20,7 +20,6 @@ var_dump(ftp_alloc($ftp, array()));
var_dump(ftp_cdup($ftp, 0)); var_dump(ftp_cdup($ftp, 0));
var_dump(ftp_chdir($ftp, array())); var_dump(ftp_chdir($ftp, array()));
var_dump(ftp_chmod($ftp, 0666)); var_dump(ftp_chmod($ftp, 0666));
var_dump(ftp_get($ftp, 1234,12));
var_dump(ftp_close()); var_dump(ftp_close());
var_dump(ftp_connect('sfjkfjaksfjkasjf')); var_dump(ftp_connect('sfjkfjaksfjkasjf'));
var_dump(ftp_delete($ftp, array())); var_dump(ftp_delete($ftp, array()));
@ -50,30 +49,27 @@ NULL
Warning: ftp_chmod() expects exactly 3 parameters, 2 given in %s on line %d Warning: ftp_chmod() expects exactly 3 parameters, 2 given in %s on line %d
bool(false) bool(false)
Warning: ftp_get() expects at least 4 parameters, 3 given in %s on line %d Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 16
NULL NULL
Warning: ftp_close() expects exactly 1 parameter, 0 given in %s004.php on line 17 Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s004.php on line 17
NULL
Warning: ftp_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s004.php on line 18
bool(false) bool(false)
Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 19 Warning: ftp_delete() expects parameter 2 to be string, array given in %s004.php on line 18
NULL NULL
Warning: ftp_exec() expects parameter 2 to be string, array given in %s004.php on line 20 Warning: ftp_exec() expects parameter 2 to be string, array given in %s004.php on line 19
NULL NULL
Warning: ftp_systype() expects exactly 1 parameter, 2 given in %s004.php on line 22 Warning: ftp_systype() expects exactly 1 parameter, 2 given in %s004.php on line 21
NULL NULL
Warning: ftp_pwd() expects exactly 1 parameter, 2 given in %s004.php on line 23 Warning: ftp_pwd() expects exactly 1 parameter, 2 given in %s004.php on line 22
NULL NULL
Warning: ftp_login() expects exactly 3 parameters, 1 given in %s004.php on line 25 Warning: ftp_login() expects exactly 3 parameters, 1 given in %s004.php on line 24
NULL NULL
Warning: ftp_login(): Not logged in. in %s004.php on line 26 Warning: ftp_login(): Not logged in. in %s004.php on line 25
bool(false) bool(false)
bool(true) bool(true)

14
ext/ftp/tests/006.phpt
View file

@ -55,13 +55,13 @@ NULL
Warning: ftp_rawlist() expects at least 2 parameters, 1 given in %s006.php on line 10 Warning: ftp_rawlist() expects at least 2 parameters, 1 given in %s006.php on line 10
NULL NULL
Warning: ftp_fget() expects at least 4 parameters, 1 given in %s006.php on line 11 Warning: ftp_fget() expects at least 3 parameters, 1 given in %s006.php on line 11
NULL NULL
Warning: ftp_nb_fget() expects at least 4 parameters, 1 given in %s006.php on line 12 Warning: ftp_nb_fget() expects at least 3 parameters, 1 given in %s006.php on line 12
NULL NULL
Warning: ftp_nb_get() expects at least 4 parameters, 1 given in %s006.php on line 13 Warning: ftp_nb_get() expects at least 3 parameters, 1 given in %s006.php on line 13
NULL NULL
Warning: ftp_pasv() expects exactly 2 parameters, 1 given in %s006.php on line 14 Warning: ftp_pasv() expects exactly 2 parameters, 1 given in %s006.php on line 14
@ -70,16 +70,16 @@ NULL
Warning: ftp_nb_continue() expects exactly 1 parameter, 0 given in %s006.php on line 15 Warning: ftp_nb_continue() expects exactly 1 parameter, 0 given in %s006.php on line 15
NULL NULL
Warning: ftp_fput() expects at least 4 parameters, 0 given in %s006.php on line 16 Warning: ftp_fput() expects at least 3 parameters, 0 given in %s006.php on line 16
NULL NULL
Warning: ftp_nb_fput() expects at least 4 parameters, 1 given in %s006.php on line 17 Warning: ftp_nb_fput() expects at least 3 parameters, 1 given in %s006.php on line 17
NULL NULL
Warning: ftp_put() expects at least 4 parameters, 1 given in %s006.php on line 18 Warning: ftp_put() expects at least 3 parameters, 1 given in %s006.php on line 18
NULL NULL
Warning: ftp_nb_put() expects at least 4 parameters, 1 given in %s006.php on line 19 Warning: ftp_nb_put() expects at least 3 parameters, 1 given in %s006.php on line 19
NULL NULL
Warning: ftp_size() expects exactly 2 parameters, 1 given in %s006.php on line 20 Warning: ftp_size() expects exactly 2 parameters, 1 given in %s006.php on line 20