4e4d319e62
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed broken build when EC unavailable
2014-02-17 19:38:49 -05:00
bd9aa181dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed broken build when EC unavailable
2014-02-17 19:38:30 -05:00
a80cec1190
Fixed broken build when EC unavailable
2014-02-17 18:55:39 -05:00
b60cb2b88a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix for bug66501 - "key type not supported in this PHP build"
2014-02-14 18:20:01 -07:00
65adb74984
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix for bug66501 - "key type not supported in this PHP build"
2014-02-14 18:15:24 -07:00
19524fc6fe
Fix for bug66501 - "key type not supported in this PHP build"
2014-02-14 18:11:46 -07:00
ce8dc0ede2
Bug #47030 (separate host and peer verification)
2014-02-14 15:17:30 -07:00
f073588e75
Fix test broken if openssl is compiled without sslv2
2014-02-14 13:39:02 -07:00
8582353700
Fix segfault accessing context when no context assigned
2014-02-14 10:24:08 -07:00
99fa59054d
Fixed SNI failure from missing Z_STRVAL_PP
2014-02-04 19:11:56 -07:00
05c309f2d8
Remove #if PHP_VERSION_ID version checks
2014-02-01 08:01:13 -07:00
58293fb533
Use master-agnostic zend_is_true checks
2014-01-31 14:18:31 -07:00
43432c12f1
Fixed build breakage from b4b4d9697f
2014-01-29 17:57:59 -07:00
b4b4d9697f
Verify peers by default in client socket operations
2014-01-28 10:05:56 -07:00
68883318aa
Prevent invalid SAN peer verification on null byte prefix attack
2014-01-27 14:51:22 -07:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
39a2dcdeac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
da62fd5ed8
Fixed bug #65486 mysqli_poll() is broken on Win x64
...
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.
Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
e9efc16660
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:37 +01:00
b6bcae5c10
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dir separator in cve-2013-6420 test
2013-12-11 13:33:16 +01:00
ff89066b3d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix dir separator in cve-2013-6420 test
2013-12-11 13:32:49 +01:00
6f739318fd
fix dir separator in cve-2013-6420 test
2013-12-11 13:31:29 +01:00
293984ac33
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:06 -08:00
41cd533298
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:35:26 -08:00
71daf3229b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
2013-12-10 11:34:35 -08:00
c1224573c7
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:03:49 -08:00
c86862cb3c
Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src
...
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src :
Fix compiler warnings in openssl.c
2013-10-18 12:03:02 +02:00
b95f9fa0aa
previous revert killed that file
2013-10-17 15:32:18 +02:00
3f2fba4c34
Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src
...
* 'updated_tls_support' of https://github.com/rdlowrey/php-src :
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 15:27:15 +02:00
dd3a4c303b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
2013-10-17 15:22:07 +02:00
8aaecef524
Revert "Added support for TLSv1.1 and TLSv1.2"
...
This reverts commit 2aaa3d538a
2013-10-17 15:20:38 +02:00
ad0a85b9e2
fix ws
2013-10-17 15:09:28 +02:00
5a7ca69e56
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:53:50 +02:00
2aaa3d538a
Added support for TLSv1.1 and TLSv1.2
...
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:49:44 +02:00
c092d286fc
Fix compiler warnings in openssl.c
2013-10-13 15:52:39 +01:00
9d57243794
Fixes broken zts build (recent openssl changes)
2013-10-12 22:28:15 +02:00
e2d123a720
C89
2013-10-09 17:16:25 +02:00
c85c50e35c
Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-src
...
* 'san_peer_matching' of https://github.com/rdlowrey/php-src :
Changed return types to zend_bool, renamed test
Added SAN matching during peer verification
2013-10-09 17:09:03 +02:00
a40dd6e963
Changed return types to zend_bool, renamed test
2013-10-09 09:55:36 -04:00
302b9d4e5c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
C89 compatibility
2013-10-09 12:30:51 +02:00
3b3c57e79e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
C89 compatibility
2013-10-09 12:30:42 +02:00
22700890d4
C89 compatibility
2013-10-09 12:30:31 +02:00
29d5ff75d5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed segfault when built with OpenSSL >= 1.0.1
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:18:29 +02:00
36fb4ed968
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed segfault when built with OpenSSL >= 1.0.1
fixing a minor typo in CODING_STANDARDS document
FIX BUG #65219 - Typo correction
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:17:48 +02:00
b026993a74
Fixed segfault when built with OpenSSL >= 1.0.1
...
(PR #481 )
2013-10-09 09:17:25 +02:00
2ddefbd2b3
Added support for TLSv1.1 and TLSv1.2
2013-10-08 14:09:17 -04:00
1970b96443
Added SAN matching during peer verification
2013-10-08 12:37:44 -04:00
ea0578e223
Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-src
...
* 'ssl-streams-crypto-method' of https://github.com/mj/php-src :
Add unit test that covers setting the crypto method.
Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
2013-10-08 16:10:00 +02:00
Daniel Lowrey