Daniel Lowrey
c985ec737d
Fix ZTS
2015-03-05 12:19:15 -07:00
Daniel Lowrey
73de105481
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:56:36 -07:00
Daniel Lowrey
65a9a5ca12
Fixed bug #68265 (SAN match fails with trailing DNS dot)
2015-03-04 23:55:42 -07:00
Daniel Lowrey
fe29b8134c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
hexadecimal is case*in*sensitive
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 23:00:59 -07:00
Daniel Lowrey
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
Daniel Lowrey
94a70b98a6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
Fix broken test
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 22:42:25 -07:00
Daniel Lowrey
5dcace058a
Fixed bug #68879 (IP Address fields in subjectAltNames not used)
2015-03-04 22:39:25 -07:00
Hannes Magnusson
3c2c029bfd
hexadecimal is case*in*sensitive
2015-03-04 16:03:45 -08:00
Daniel Lowrey
b5d97140c0
Merge branch 'tls-alpn'
...
* tls-alpn:
Improve test to target specific issue
Misc updates/cleanup
Add TLS ALPN extension support in crypto client/server streams
Add stream_socket_crypto_info() function
Update for compatibility with newer openssl libs
2015-03-04 13:56:58 -07:00
Daniel Lowrey
5de64a29e6
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #68920 (use strict peer_fingerprint input checks)
Conflicts:
ext/openssl/xp_ssl.c
2015-03-04 12:50:35 -07:00
Daniel Lowrey
241f3c34b8
Fixed bug #68920 (use strict peer_fingerprint input checks)
2015-03-04 12:47:46 -07:00
Daniel Lowrey
a39b1898fe
Misc updates/cleanup
2015-03-04 09:24:27 -05:00
Daniel Lowrey
3e841470c9
Add TLS ALPN extension support in crypto client/server streams
2015-02-28 17:41:30 -05:00
Daniel Lowrey
13acb7ec65
Add stream_socket_crypto_info() function
2015-02-28 17:41:29 -05:00
Daniel Lowrey
3ff36c265f
Update for OpenSSL 1.0.2 compatibility
2015-02-28 17:41:29 -05:00
Anatol Belski
c17e007a29
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix condition
2015-02-13 13:40:37 +01:00
Anatol Belski
b3d28d14d6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix condition
2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b
fix condition
2015-02-13 13:39:46 +01:00
Daniel Lowrey
712712e8d6
Merge branch 'PHP-5.6'
...
Conflicts:
ext/openssl/xp_ssl.c
2015-02-09 15:14:47 -05:00
Daniel Lowrey
fb2314798e
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/openssl/xp_ssl.c
2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c
Miscellaneous cleanup
2015-02-09 11:42:17 -05:00
Brad Broerman
dddbe0fc33
Update xp_ssl.c
...
Added TSRMLS_CC to php_openssl_sockop_io calls.
2015-02-04 10:13:36 -05:00
Xinchen Hui
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Michael Wallner
3c4540dec9
fix warnings
2015-01-30 22:49:44 +01:00
Anatol Belski
8d054be62f
fix datatype mismatches, improve error checks
2015-01-30 14:36:33 +01:00
Anatol Belski
085907d168
fix datatype mismatches, improved error checks
2015-01-30 13:52:11 +01:00
Brad Broerman
1482ed2d56
reneg and should_close are not yet members of sslsock. Removing...
2015-01-28 22:36:41 -05:00
Brad Broerman
fd4641696c
Updated with SSL fixes (backported from trunk)
2015-01-28 00:04:20 -05:00
Daniel Lowrey
4965fe7fb8
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
...
Conflicts:
ext/openssl/xp_ssl.c
2015-01-27 13:22:47 -05:00
Brad Broerman
8302d658db
Quick fix
2015-01-26 21:35:35 -05:00
Brad Broerman
db49dd91bd
Fixed windows infinite loop problem.
2015-01-26 20:40:52 -05:00
Anatol Belski
ee8a0b3797
cleanup TSRMLS_*
2015-01-23 18:05:18 +01:00
Anatol Belski
647caea9f7
C89 compat
2015-01-23 15:04:29 +01:00
Daniel Lowrey
459edceea9
Merge branch 'master' of https://github.com/bbroerman30/php-src
...
Conflicts:
ext/openssl/xp_ssl.c
2015-01-23 01:03:39 -05:00
Brad Broerman
ebb67cd6fe
Renamed timeval functions to comply with PHP naming standards
2015-01-21 10:20:32 -05:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Brad Broerman
9ec7fac127
Change declaration of subtractTimeval and compareTimeval to static
2015-01-10 11:19:17 -05:00
Brad Broerman
8ded274413
Re-ordered the read and write methods to match the order of the original code, to make the DIFF easier to read.
2014-12-31 13:30:48 -05:00
Brad Broerman
fea9253c1c
try to update mod
2014-12-31 10:59:57 -05:00
Brad Broerman
f22c3d643a
Fixed indentation
2014-12-31 10:49:21 -05:00
Brad Broerman
49571cfad7
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
ext/openssl/xp_ssl.c
2014-12-30 19:44:45 -05:00
Anatol Belski
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Ferenc Kovacs
d2ab6e1d15
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
2014-10-15 19:41:27 +02:00
Ferenc Kovacs
feadaaed56
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
...
This reverts commit 98e67add152cdc1a2b74
2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f
Revert "fix TS build"
...
This reverts commit 84a4041ba4
2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
...
This reverts commit 30a73658c67fac56e072
2014-10-15 19:33:31 +02:00
