|
Revision tags: php-5.6.7RC1, php-5.5.23RC1, POST_PHP7_EREG_MYSQL_REMOVALS, PRE_PHP7_EREG_MYSQL_REMOVALS, php-5.6.6, php-5.5.22, php-5.4.38, POST_PHP7_REMOVALS, PRE_PHP7_REMOVALS, php-5.6.6RC1, php-5.5.22RC1, php-5.5.21, php-5.6.5, php-5.4.37, php-5.5.21RC1, php-5.6.5RC1, POST_NATIVE_TLS_MERGE, PRE_NATIVE_TLS_MERGE, php-5.5.20, php-5.4.36, php-5.6.4, php-5.6.4RC1, php-5.5.20RC1, php-5.6.3, php-5.5.19, php-5.4.35, php-5.6.3RC1, php-5.5.19RC1, php-5.5.18, php-5.4.34, php-5.5.18RC1, php-5.6.1, php-5.6.2, php-5.4.33, php-5.5.17, php-5.6.1RC1, php-5.5.17RC1, php-5.4.33RC1, php-5.6.0, POST_AST_MERGE, PRE_AST_MERGE |
|
| #
e7df9d71 |
| 23-Aug-2014 |
Chris Wright |
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
show more ...
|
| #
2fa8d67a |
| 03-Mar-2015 |
Dmitry Stogov |
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. |
| #
e98caf27 |
| 02-Feb-2015 |
Xinchen Hui |
found type is unnecessary |
| #
7ec8eb38 |
| 02-Feb-2015 |
Xinchen Hui |
Use resource directly |
| #
38efb690 |
| 02-Feb-2015 |
Xinchen Hui |
Ported ftp |
| #
94280990 |
| 02-Feb-2015 |
Xinchen Hui |
Cleanup resource handling APIs |
| #
fc33f52d |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
| #
0579e827 |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
| #
f62ad3bc |
| 15-Dec-2014 |
Anatol Belski |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functio
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
show more ...
|
| #
7081c9bc |
| 15-Dec-2014 |
Xinchen Hui |
Reorder to save alignment size (of course, only for common used structs) |
| #
e112f6a0 |
| 14-Dec-2014 |
Anatol Belski |
second shot on removing TSRMLS_* |
| #
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things |
| #
d2ab6e1d |
| 15-Oct-2014 |
Ferenc Kovacs |
Merge branch 'PHP-5.6'
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Reve
Merge branch 'PHP-5.6'
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
show more ...
|
| #
7b8222aa |
| 15-Oct-2014 |
Ferenc Kovacs |
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing
changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd. |
| #
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/ |
| #
fdd1e96f |
| 03-Sep-2014 |
Nikita Popov |
Revert "remove a few gcc format attributes from some printf-like functions"
This reverts commit 25f5ba94aca1e89ee5f0c66513e58826afa3b853. |
| #
25f5ba94 |
| 31-Aug-2014 |
Nuno Lopes |
remove a few gcc format attributes from some printf-like functions
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it |
| #
0a1df748 |
| 27-Aug-2014 |
Chris Wright |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
|
| #
db03216e |
| 27-Aug-2014 |
Chris Wright |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
|
| #
30a73658 |
| 27-Aug-2014 |
Chris Wright |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
|
| #
32be79dc |
| 23-Aug-2014 |
Chris Wright |
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Fix stream_select() issue with OpenSSL buffer
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
show more ...
|
| #
455741fc |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 4 |
| #
4d997f63 |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 3 |
|
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
| #
8ee2a4a9 |
| 16-Aug-2014 |
Anatol Belski |
first shot on merging the core fro the int64 branch |
|
Revision tags: POST_PHPNG_MERGE, PRE_PHPNG_MERGE, php-5.6.0RC4, php-5.3.29 |
|
| #
417ed16d |
| 07-Aug-2014 |
Dmitry Stogov |
Make stream->context indirect trough zend_resource (stream->ctx->ptr).
Fixed ext/standard/tests/streams/bug61115.phpt |
