Commit graph

54 commits

Author SHA1 Message Date
Nikita Popov
6122f67492 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 04:57:13 +02:00
Nikita Popov
fcf78dfb89 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 04:55:15 +02:00
Ville Hukkamaki
742783c3ee Fixed bug #73457
Correctly report errors when opening FTP data connection.
2018-09-04 04:53:38 +02:00
Nikita Popov
ad87e2bd6a Merge branch 'PHP-7.2' 2018-03-23 18:57:58 +01:00
atvoicu
17ed2f21cf Add missing skip prefix for some SKIPIF messages 2018-03-23 18:56:36 +01:00
Gabriel Caruso
ded3d984c6 Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Gabriel Caruso
5153413ed4
Test more functions of ftp 2018-02-19 08:27:37 +01:00
Gabriel Caruso
91b09c7aa6 Increase ext/ftp coverage 2018-02-06 16:28:42 +01:00
Gabriel Caruso
ce1d69a1f6 Use int instead of integer in type errors
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Michael Kliewe
ba0ef9139c convert spaces to tabs in ext/ftp/tests/server.inc 2017-10-28 13:02:23 +02:00
Michael Kliewe
7d5bf6e269 Add tests for ftp_rename 2017-10-28 13:02:23 +02:00
Michael Paul
6acfc7a239
Add test for ftp functions with bogus resource 2017-09-12 07:12:35 +01:00
Michael Paul
2133b55efd
Refactor ftp_append test to clean temporary files 2017-09-12 07:10:22 +01:00
Nikita Popov
902188e5e3 Merge branch 'PHP-7.2' 2017-08-02 20:53:32 +02:00
Andreas Treichel
29e4d4eee6 Add ftp_append to create a new file or append data to an existing file (RFC959) 2017-08-02 20:52:28 +02:00
Andreas Treichel
00cd671233
Make transfer mode optional, set default to binary 2017-07-25 09:09:12 +01:00
chance garcia
510230d3dc Test ftp_ssl_connect() function : error conditions
test timeout warning
ensure connection fails with invalid hostname
test invalid parameter types
test exceeds expected number of parameters
2017-06-19 19:48:52 -04:00
Andreas Treichel
5b1300b6c9 ftp_mlsd(): Parse the MLSD response 2017-02-17 21:31:18 +01:00
Nikita Popov
267ab47366 Merge branch 'PHP-7.1' 2017-02-16 12:47:26 +01:00
Mitch Hagstrand
3b91ed112f Make the ftp and stream tests more reliable.
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
2017-02-16 12:46:55 +01:00
Andreas Treichel
0103d1e3bc
FTP: implement MLSD for structured listing of directories, decribed at https://tools.ietf.org/html/rfc3659 2017-01-29 07:28:22 +00:00
Mitch Hagstrand
47007455dc
Fix FTP tests for Travis CI.
This suppresses the errors from stream_socket_server() until
server.inc will not make anymore attempts.
2017-01-09 00:36:39 +00:00
Nikita Popov
2c12a5f0a8 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-30 13:44:59 +02:00
Ville Hukkamäki
af7828a20f Test case for bug #72771 2016-08-30 13:44:34 +02:00
Nikita Popov
a2a2ea18fe Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
2016-08-05 23:09:30 +02:00
Ville Hukkamaki
65056e9d6c Fix #72764
Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.
2016-08-05 22:56:54 +02:00
Nikita Popov
0d2c4f822c Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
2016-07-27 15:58:06 +02:00
Ville Hukkamäki
cce457c68c Fix bug #72667
Open data stream after receiving PASV reply, before sending the
main request.

Included test cases for opendir() with ftp:// and ftps:// wrappers.
Test cases re-use ext/ftp/tests/server.inc

Conflicts:
	ext/standard/ftp_fopen_wrapper.c
2016-07-27 15:55:47 +02:00
Dmitry Stogov
9d71d65388 Fixed tests 2015-03-12 16:58:50 +03:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Stanislav Malyshev
64e4261c9b fix unstable test 2014-07-08 14:13:46 -07:00
ptarjan
9c1e1bbc05 fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Philip Hofstetter
96cc419924 Fix bug #65667: ftp_nb_continue produces segfault
the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.

As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.

This regression was added in a93a462dce
and this patch restores the behavior that was seen pre-patch.
2013-10-04 17:25:46 +02:00
Andreas Streichardt
a93a462dce First fixes for a 64bit compatible ftp extension 2013-08-04 19:31:30 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Zoe Slattery
c0c141d0cf server for ftp tests 2009-08-30 09:31:54 +00:00
Zoe Slattery
6a22ec3eda More tests from 2009 testfest 2009-08-30 09:30:13 +00:00
Antony Dovgal
e3e34fa7ed MF52: fix test: don't create tmp files in "." and clean up when done 2009-01-09 23:12:12 +00:00
Zoe Slattery
6d246c060b new test from Nat Mcugh 2008-12-31 20:06:26 +00:00
Zoe Slattery
7156227045 New FTP test from Nathaniel McHugh 2008-12-17 12:35:26 +00:00
Zoe Slattery
9271f52838 FTP test from Nathaniel McHugh 2008-12-05 16:28:16 +00:00
Antony Dovgal
1f65545121 fix test names 2007-05-07 18:03:01 +00:00
Antony Dovgal
22a866818b fix test 2007-02-21 19:22:28 +00:00
Nuno Lopes
3d65d6d8d9 Fixed bug #37799 (ftp_ssl_connect() falls back to non-ssl connection) 2007-02-13 18:29:10 +00:00
Hannes Magnusson
b12e3e1475 Fix tests 2006-12-19 10:03:24 +00:00
Nuno Lopes
e65bdffab5 tests + BFN 2006-12-01 16:37:39 +00:00
Antony Dovgal
a3c2958f22 MFH: fix test on FreeBSD 2006-11-27 11:43:59 +00:00
Nuno Lopes
e8384cbcca more tests 2006-11-24 20:18:54 +00:00
Nuno Lopes
d64b17543c fix tests after Tony's commit and add a test for the bug he fixed 2006-11-24 15:47:45 +00:00