49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
83bfefeccb
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
2015-10-26 15:54:29 +01:00
81f356b4ae
Fix Bug #69402 : Reading empty SSL stream hangs until timeout
2015-04-14 09:25:11 -06:00
c661121459
Don't block on crypto data inside stream_select()
2015-03-11 09:44:07 -06:00
3f6b12795c
Fix bug# 69215 (Crypto servers should send client CA list)
2015-03-10 18:13:10 -06:00
69691cc8ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix crypto stream timeout regressions
2015-03-09 15:55:33 -06:00
bbfd4a5e62
Fix crypto stream timeout regressions
2015-03-09 15:53:26 -06:00
e7df9d710c
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
2015-03-05 17:18:14 -07:00
ca24d19a89
Really fix zts this time
2015-03-05 14:09:25 -07:00
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
65a9a5ca12
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:55:42 -07:00
1de1ff75f5
Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6
...
* 'PHP-5.6' of https://github.com/bjori/php-src :
hexadecimal is case*in*sensitive
2015-03-04 22:55:22 -07:00
5dcace058a
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
2015-03-04 22:39:25 -07:00
3c2c029bfd
hexadecimal is case*in*sensitive
2015-03-04 16:03:45 -08:00
241f3c34b8
Fixed bug #68920 (use strict peer_fingerprint input checks)
2015-03-04 12:47:46 -07:00
b3d28d14d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix condition
2015-02-13 13:40:10 +01:00
5ff77b005b
fix condition
2015-02-13 13:39:46 +01:00
fb2314798e
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/openssl/xp_ssl.c
2015-02-09 11:44:09 -05:00
1eef4f2a0c
Miscellaneous cleanup
2015-02-09 11:42:17 -05:00
dddbe0fc33
Update xp_ssl.c
...
Added TSRMLS_CC to php_openssl_sockop_io calls.
2015-02-04 10:13:36 -05:00
1482ed2d56
reneg and should_close are not yet members of sslsock. Removing...
2015-01-28 22:36:41 -05:00
fd4641696c
Updated with SSL fixes (backported from trunk)
2015-01-28 00:04:20 -05:00
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
feadaaed56
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit 98e67add152cdc1a2b74
2014-10-15 19:34:07 +02:00
4fb998d42f
Revert "fix TS build"
...
This reverts commit 84a4041ba4
2014-10-15 19:33:47 +02:00
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c67fac56e072
2014-10-15 19:33:31 +02:00
528e4166a6
Revert "Bug #67965 : Fix blocking behavior in non-blocking crypto streams"
...
This reverts commit f86b2193a4
2014-10-15 19:32:46 +02:00
ff91a48f6e
Revert "Bug #41631 : Fix regression from first attempt ( 6569db8)"
...
This reverts commit 372844918a
2014-10-15 19:32:14 +02:00
6d9c9f8f04
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
...
This reverts commit 6569db8808
2014-10-15 14:38:12 +02:00
0d776ef87b
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
2014-09-24 10:34:55 +02:00
edb2799333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #41631 : Fix regression from first attempt (6569db8#67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 10:24:40 -06:00
bf2f80b223
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #41631 : Fix regression from first attempt (6569db8#67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 09:27:20 -06:00
372844918a
Bug #41631 : Fix regression from first attempt ( 6569db8)
2014-09-09 09:01:42 -06:00
f86b2193a4
Bug #67965 : Fix blocking behavior in non-blocking crypto streams
2014-09-09 07:37:57 -06:00
db03216e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
2014-08-27 16:06:28 +01:00
30a73658c6
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
2014-08-27 16:01:18 +01:00
32be79dcfa
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
2014-08-27 13:25:50 +01:00
546a32e2b3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
Conflicts:
ext/openssl/xp_ssl.c
2014-08-25 18:16:38 +02:00
640214701c
Bug #67850 : Build when OpenSSL compiled without SSLv3 support
2014-08-25 17:28:09 +02:00
8b8297170e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TS build
2014-08-07 19:50:45 +02:00
75991561d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TS build
2014-08-07 19:50:25 +02:00
84a4041ba4
fix TS build
2014-08-07 19:49:59 +02:00
98e67add15
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #41631 : Observe socket read timeouts in SSL streams
Conflicts:
ext/openssl/xp_ssl.c
2014-08-07 12:07:55 -04:00
5ac2e5f850
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #41631 : Observe socket read timeouts in SSL streams
2014-08-07 11:51:42 -04:00
6569db8808
Bug #41631 : Observe socket read timeouts in SSL streams
2014-08-07 11:47:42 -04:00
8f345a7148
Moved streams related functions to xp_ssl.c
2014-07-31 12:17:17 +08:00
a7dad26c4b
Wildcards should only be used in the first name component; fixed comment style
2014-07-29 19:15:01 +08:00
38e714ece5
Fixed #67666 - Subject altName doesn't match wildcards
2014-07-24 14:36:31 +08:00
cbcbf73fe8
Add ifdef on ecdh for single_ecdh_use
...
Allows build with OpenSSL < 0.9.8
2014-07-16 00:10:29 +03:00
Lior Kaplan