| #
8302d658 |
| 27-Jan-2015 |
Brad Broerman |
Quick fix |
| #
db49dd91 |
| 27-Jan-2015 |
Brad Broerman |
Fixed windows infinite loop problem. |
| #
ee8a0b37 |
| 23-Jan-2015 |
Anatol Belski |
cleanup TSRMLS_* |
| #
647caea9 |
| 23-Jan-2015 |
Anatol Belski |
C89 compat |
| #
459edcee |
| 23-Jan-2015 |
Daniel Lowrey |
Merge branch 'master' of https://github.com/bbroerman30/php-src
Conflicts:
ext/openssl/xp_ssl.c
|
| #
ebb67cd6 |
| 21-Jan-2015 |
Brad Broerman |
Renamed timeval functions to comply with PHP naming standards |
| #
fc33f52d |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
| #
0579e827 |
| 15-Jan-2015 |
Xinchen Hui |
bump year |
| #
73c1be26 |
| 15-Jan-2015 |
Xinchen Hui |
Bump year |
| #
b7a7b1a6 |
| 03-Jan-2015 |
Stanislav Malyshev |
trailing whitespace removal |
| #
9ec7fac1 |
| 10-Jan-2015 |
Brad Broerman |
Change declaration of subtractTimeval and compareTimeval to static |
| #
8ded2744 |
| 31-Dec-2014 |
Brad Broerman |
Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read. |
| #
fea9253c |
| 31-Dec-2014 |
Brad Broerman |
try to update mod |
| #
f22c3d64 |
| 31-Dec-2014 |
Brad Broerman |
Fixed indentation |
| #
49571cfa |
| 31-Dec-2014 |
Brad Broerman |
Merge remote-tracking branch 'upstream/master'
Conflicts:
ext/openssl/xp_ssl.c
|
| #
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 ...
|
| #
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 |
| #
d3bb0ba3 |
| 24-Sep-2014 |
Remi Collet |
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
|
