Anatol Belski
ec89c85054
cleaning up the version macros
2015-03-23 20:13:59 +01:00
Anatol Belski
41571e7fa9
improve ssl operations with possible renegotiation
2015-03-12 17:31:28 +01:00
Anatol Belski
1cf70266e7
use _set_errno where appropriate
2015-03-12 16:24:56 +01:00
Dmitry Stogov
9d71d65388
Fixed tests
2015-03-12 16:58:50 +03:00
Anatol Belski
1923c7a9b8
simplify condition
2015-03-12 10:21:43 +01:00
Anatol Belski
53b7258797
force ext/ftp to be always shared on Windows
2015-03-12 00:36:22 +01:00
Anatol Belski
2f443acad1
remove ext/openssl dependency for ext/ftp from conf
2015-03-12 00:13:01 +01:00
Anatol Belski
d2ee0840d2
don't depend on ext/openssl for ftp ssl support
...
instead just link against the openssl and init manually, that's
more flexible
2015-03-11 23:58:59 +01:00
Anatol Belski
d5f2b4b398
fix ftp_login with ssl enabled
2015-03-11 21:46:40 +01:00
Anatol Belski
f1a47988b0
added comment
2015-03-11 21:46:39 +01:00
Anatol Belski
167979fe76
enable ftps for shared ext/ftp
2015-03-11 21:46:38 +01:00
Xinchen Hui
38efb690c0
Ported ftp
2015-02-02 13:53:03 +08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Veres Lajos
06fdf359e3
typo fixes - https://github.com/vlajos/misspell_fixer
2014-11-23 14:52:47 -08:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Nikita Popov
dd38c9e101
Fix ftp_login()
2014-09-03 16:52:56 +02:00
Anatol Belski
734e11cca7
fixed remaining 's' args for ftp
2014-08-27 23:56:19 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
6719106257
ported ext/ftp
2014-08-19 21:49:34 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Dmitry Stogov
4c716e8b51
Merge branch 'master' into test
...
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631 : Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Daniel Lowrey
60552a8871
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
2014-08-05 22:43:12 -04:00
Xinchen Hui
d8431ba09c
Merge branch 'master' into phpng
2014-07-09 18:35:30 +08:00
Stanislav Malyshev
f559976be6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix unstable test
2014-07-08 14:31:40 -07:00
Stanislav Malyshev
64e4261c9b
fix unstable test
2014-07-08 14:13:46 -07:00
Dmitry Stogov
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
Dmitry Stogov
7b1cb4922f
Fixed safe resource close.
...
It must not de deleted (just closed), because it still may be referenced from zval(s).
This fixes few ext/ftp test memory failures detected with valgrind.
2014-05-13 12:47:34 +04:00
Dmitry Stogov
485a60414d
Fixed incorrect boolean IS_FALSE/IS_TRUE handling
2014-05-06 15:59:49 +04:00
Dmitry Stogov
ebe024fd78
Fixed memory leaks
2014-05-06 15:18:17 +04:00
krakjoe
360962ea29
fix ftp for ng
2014-05-06 07:54:54 +01:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Nikita Popov
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6
Fix leak caused by fix to bug #65667
...
ftp->stream is now closed in the ftp resource dtor.
2013-12-30 13:53:12 +01:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01: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
Rasmus Lerdorf
288a4ec3bd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Clean up this weird safe_emalloc() call
2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b
Clean up this weird safe_emalloc() call
2013-10-20 09:36:50 -07:00
Rasmus Lerdorf
c5e5a6c2ac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Minor Coverity tweaks
2013-10-20 08:56:24 -07:00
Rasmus Lerdorf
1494298231
Minor Coverity tweaks
2013-10-20 08:55:48 -07:00
Rasmus Lerdorf
683a7d719b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove senseless check here
2013-10-19 20:56:01 -07:00
Rasmus Lerdorf
fb38fdc7fd
Remove senseless check here
2013-10-19 20:55:02 -07:00
