| #
f22c3d64 |
| 31-Dec-2014 |
Brad Broerman |
Fixed indentation
|
| #
e112f6a0 |
| 14-Dec-2014 |
Anatol Belski |
second shot on removing TSRMLS_*
|
| #
bdeb220f |
| 13-Dec-2014 |
Anatol Belski |
first shot remove TSRMLS_* things
|
| #
feadaaed |
| 15-Oct-2014 |
Ferenc Kovacs |
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing
changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147.
|
| #
4fb998d4 |
| 15-Oct-2014 |
Ferenc Kovacs |
Revert "fix TS build"
This reverts commit 84a4041ba47e92e7a0ba03938d0ebf88b5fcf6cf.
|
| #
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.
|
| #
528e4166 |
| 15-Oct-2014 |
Ferenc Kovacs |
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
This reverts commit f86b2193a483f56b0bd056570a0cdb57ebe66e2f.
|
| #
ff91a48f |
| 15-Oct-2014 |
Ferenc Kovacs |
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
This reverts commit 372844918a318ad712e16f9ec636682424a65403.
|
| #
6d9c9f8f |
| 15-Oct-2014 |
Julien Pauli |
Revert "Bug #41631: Observe socket read timeouts in SSL streams"
This reverts commit 6569db88081562f68a4f79e52cba83482bdf05fc.
Conflicts:
ext/openssl/xp_ssl.c
|
| #
c00424e4 |
| 15-Oct-2014 |
Anatol Belski |
bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
|
| #
86ef4876 |
| 26-Sep-2014 |
Anatol Belski |
cleanup TSRMLS_FETCH in openssl
|
| #
408b1720 |
| 26-Sep-2014 |
Stanislav Malyshev |
Revert xp_ssl.c to the state of 5.4.32 due to regressions
|
| #
0d776ef8 |
| 24-Sep-2014 |
Remi Collet |
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
|
| #
e33f3d3b |
| 20-Sep-2014 |
Nikita Popov |
Move smart_str implementation into Zend/
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just m
Move smart_str implementation into Zend/
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
show more ...
|
| #
d0cb7153 |
| 19-Sep-2014 |
Johannes Schlüter |
s/PHP 5/PHP 7/
|
| #
37284491 |
| 09-Sep-2014 |
Daniel Lowrey |
Bug #41631: Fix regression from first attempt (6569db8)
|
| #
f86b2193 |
| 09-Sep-2014 |
Daniel Lowrey |
Bug #67965: Fix blocking behavior in non-blocking crypto streams
|
| #
dadbbf89 |
| 27-Aug-2014 |
Johannes Schlüter |
Fix compilation on systems without ecdh_curve
|
| #
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 ...
|
| #
af59e92b |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 7
|
| #
c3e3c98e |
| 25-Aug-2014 |
Anatol Belski |
master renames phase 1
|
| #
64021470 |
| 25-Aug-2014 |
Daniel Lowrey |
Bug #67850: Build when OpenSSL compiled without SSLv3 support
|
|
Revision tags: POST_64BIT_BRANCH_MERGE, PRE_64BIT_BRANCH_MERGE, php-5.5.16, php-5.4.32 |
|
| #
1899e6f9 |
| 19-Aug-2014 |
Anatol Belski |
ported ext/openssl
|
| #
63d3f0b8 |
| 19-Aug-2014 |
Anatol Belski |
basic macro replacements, all at once
|
| #
56c7b27d |
| 19-Aug-2014 |
Anatol Belski |
fix wrong pointer indirection
|
