summaryrefslogtreecommitdiff
path: root/ext/ftp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-08-301-1/+8
|\
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-08-301-1/+8
| |\
| | * Test case for bug #72771Ville Hukkamäki2016-08-301-1/+8
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-08-131-17/+24
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-08-131-17/+24
| |\ \ | | |/
| | * Bug 70195Benedict Singer2016-08-131-17/+25
| | | | | | | | | | | | | | | | | | | | | Many FTP-S servers now require FTP clients to re-use the SSL session from the control connection on the data connection, to prove that the same entity controls both connections. This patch updates PHP's FTP-S client code to allow that possibility.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-08-051-4/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-08-051-4/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/standard/ftp_fopen_wrapper.c
| | * Fix #72764Ville Hukkamaki2016-08-051-4/+4
| | | | | | | | | | | | | | | Negotiate data channel encryption after NLST command. This is to prevent issues with IIS and ProFTPD.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-272-57/+76
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-272-57/+76
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/standard/ftp_fopen_wrapper.c
| | * Fix bug #72667Ville Hukkamäki2016-07-272-57/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fixed compilation warningsDmitry Stogov2016-06-221-3/+3
| | |
* | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-211-2/+2
|/ / | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | allow static build of ext/ftpAnatol Belski2016-01-081-3/+3
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-014-4/+4
|\ \ | |/ | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-014-4/+4
| |
* | Implement FR #55651 (Option to ignore the returned FTP PASV address)Avi Brender2015-12-154-3/+23
|\ \ | |/
| * Implement FR #55651 (Option to ignore the returned FTP PASV address)Avi Brender2015-12-154-3/+23
| |
* | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-221-1/+0
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-05-311-2/+0
|\ \ | |/ | | | | | | * PHP-5.6: improve fix for Bug #69545
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-311-2/+0
| |\ | | | | | | | | | | | | * PHP-5.5: improve fix for Bug #69545
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-311-2/+0
| | |\ | | | | | | | | | | | | | | | | * PHP-5.4: improve fix for Bug #69545
| | | * improve fix for Bug #69545Stanislav Malyshev2015-05-311-2/+0
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-05-121-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: Zend/zend_alloc.c Zend/zend_operators.c ext/ftp/ftp.c ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/dir.c ext/standard/file.c ext/standard/pack.c ext/standard/string.c main/rfc1867.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-05-121-41/+41
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/standard/pack.c
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-05-121-41/+41
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: fix format update NEWS Add test for bug #69522 Update tests Fix bug #69522 - do not allow int overflow Forgot test file Fix bug #69403 and other int overflows Fixed bug #69418 - more s->p fixes for filenames Fixed bug #69364 - use smart_str to assemble strings Fix bug #69453 - don't try to cut empty string Fix bug #69545 - avoid overflow when reading list Conflicts: ext/pcntl/pcntl.c ext/standard/basic_functions.c ext/standard/pack.c ext/standard/tests/dir/opendir_variation1-win32.phpt
| | | * Fix bug #69545 - avoid overflow when reading listStanislav Malyshev2015-04-291-41/+41
| | | |
| | * | Bump yearXinchen Hui2015-01-154-4/+4
| | | |
| | * | fix unstable testStanislav Malyshev2014-07-081-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-154-4/+4
| | | |
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
| * | | Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context ↵Ferenc Kovacs2014-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | option" This reverts commit a51bf0cadf7862d10b2cc19cae2c991d24d670b1.
| * | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context optionDaniel Lowrey2014-08-051-1/+1
| | | |
* | | | cleaning up the version macrosAnatol Belski2015-03-232-1/+4
| | | |
* | | | improve ssl operations with possible renegotiationAnatol Belski2015-03-121-10/+138
| | | |
* | | | use _set_errno where appropriateAnatol Belski2015-03-121-6/+25
| | | |
* | | | Fixed testsDmitry Stogov2015-03-122-0/+2
| | | |
* | | | simplify conditionAnatol Belski2015-03-121-5/+1
| | | |
* | | | force ext/ftp to be always shared on WindowsAnatol Belski2015-03-121-1/+1
| | | |
* | | | remove ext/openssl dependency for ext/ftp from confAnatol Belski2015-03-121-2/+1
| | | |
* | | | don't depend on ext/openssl for ftp ssl supportAnatol Belski2015-03-111-12/+9
| | | | | | | | | | | | | | | | | | | | instead just link against the openssl and init manually, that's more flexible
* | | | fix ftp_login with ssl enabledAnatol Belski2015-03-111-7/+38
| | | |
* | | | added commentAnatol Belski2015-03-111-0/+1
| | | |
* | | | enable ftps for shared ext/ftpAnatol Belski2015-03-116-24/+54
| | | |
* | | | Ported ftpXinchen Hui2015-02-021-36/+98
| | | |
* | | | bump yearXinchen Hui2015-01-154-4/+4
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-103-40/+40
| | | |
* | | | Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-211-1/+1
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-133-137/+136
| | | |
View Lorry Controller Status