bab017ddfd
Remove test case invalidated by openssl.cafile accessibility change
2014-02-25 13:02:13 -07:00
bd95716b8e
Merge branch 'windowsPeerVerification' of https://github.com/DaveRandom/php-src into PHP-5.6
...
* 'windowsPeerVerification' of https://github.com/DaveRandom/php-src :
Update openssl tests with new server/client test harness
Add peer certificate verification on windows
2014-02-25 12:43:52 -07:00
f8fe09dcef
Tolerate non-standard newlines when parsing stream CA files
2014-02-25 09:59:13 -07:00
a4c7ab8399
Remove openssl tests that shouldn't have survived last merge
...
These are .phpt files I meant to remove with the last batch as
the same functionality is now covered in other tests and these
are no longer needed.
2014-02-25 09:59:13 -07:00
a031dc06d9
Add openssl.cafile ini check when loading cainfo
2014-02-25 09:59:13 -07:00
47b5873c5d
Change openssl directives to PHP_INI_PERDIR
...
Because openssl.cafile and openssl.capath have implications for
security these directives have been changed to PHP_INI_PERDIR
(previously PHP_INI_ALL)
2014-02-25 09:59:13 -07:00
d6fb7b8f2e
Update openssl tests with new server/client test harness
2014-02-25 16:51:50 +00:00
480e4f8541
Add peer certificate verification on windows
...
Peer certificate verification on Windows using the native certificate store and the Windows API
2014-02-25 16:51:49 +00:00
aad7b72472
Use API instead of directly acessing the structure
2014-02-25 17:39:06 +02:00
5c8a0c92d1
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-23 14:57:21 +01:00
2198bbce86
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-23 14:56:32 +01:00
756ee95605
We can't dereference dbh if it is NULL
2014-02-23 14:18:24 +01:00
5b6ef90bc0
fix linkage
...
"extern inline" looks like tricky case for portability, but extern
is required with VS. So reduce the case to a starndard one to avoid
unporbatibily.
2014-02-21 23:09:16 +01:00
c3d76441d5
Fix build against older OpenSSL libs
2014-02-21 12:16:23 -07:00
5389d0963c
Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
...
* 'reneg-limit' of https://github.com/rdlowrey/php-src :
Mitigate client-initiated SSL renegotiation DoS
2014-02-21 09:13:55 -07:00
b6edbd5897
Mitigate client-initiated SSL renegotiation DoS
2014-02-21 06:31:56 -07:00
f51555ca58
C89 compat
2014-02-21 11:23:42 +01:00
31f5515059
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added information about interned strings usage
Conflicts:
NEWS
2014-02-21 12:44:58 +04:00
851f362882
Added information about interned strings usage
2014-02-21 12:43:42 +04:00
aebfc519ea
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated opcache version
2014-02-21 12:06:35 +04:00
f06b3432c8
Updated opcache version
2014-02-21 12:04:42 +04:00
b9a87a5079
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added function opcache_is_script_cached(). (Danack)
Conflicts:
NEWS
2014-02-21 12:00:33 +04:00
884bbcd537
Added function opcache_is_script_cached(). (Danack)
2014-02-21 11:59:14 +04:00
9f94e0b51c
Improve OpenSSL compile flag compatibility, minor updates
2014-02-20 17:23:34 -07:00
3a9829af20
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
2014-02-20 17:10:06 -07:00
d0c9207cff
Improve server forward secrecy, refactor client SNI
2014-02-20 17:10:06 -07:00
742fc5fb35
Add 'honor_cipher_order' server context option
2014-02-20 17:10:06 -07:00
081c8e9d92
Add 'capture_session_meta' context option
2014-02-20 17:10:06 -07:00
b98b093d73
Disable TLS compression by default in both clients and servers
2014-02-20 17:10:06 -07:00
b9ba011c0f
Release ssl buffers
2014-02-20 17:10:06 -07:00
df6bfe3be2
Add openssl_get_cert_locations() function
2014-02-20 17:10:06 -07:00
258d04df5c
Explicitly set cert verify depth if not specified
2014-02-20 17:10:06 -07:00
225f534b1a
Strengthen default cipher list
2014-02-20 17:10:06 -07:00
b67c8b8603
updated libmagic.patch for 5.6+
2014-02-20 19:05:59 +01:00
e244e2245b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch in 5.4/5
2014-02-20 19:00:36 +01:00
ce1fd72776
updated libmagic.patch in 5.4/5
2014-02-20 19:00:05 +01:00
67d281f093
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed leak introduced after CVE/upgrade
2014-02-20 18:55:05 +01:00
6d4d4155d2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed leak introduced after CVE/upgrade
2014-02-20 18:54:35 +01:00
10eb007070
fixed leak introduced after CVE/upgrade
2014-02-20 18:53:53 +01:00
c0d26bb138
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-20 11:19:52 +08:00
143bb29c1a
Fixes #66714 : imageconvolution breakage in 5.5.9
...
5.5.9 included some GD fixes related to #66356 . One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.
2014-02-19 15:24:15 -06:00
e272225e2a
Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
...
* 'bug-65538' of https://github.com/rdlowrey/php-src :
Add tests for Bug #65538
Fix Bug #65538 (cafile now supports stream wrappers)
2014-02-19 04:17:33 -07:00
d9036d14f7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Skip failing tests when EC unavailable (RHEL)
2014-02-19 04:01:57 -07:00
a7d3606650
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)
Conflicts:
ext/openssl/openssl.c
2014-02-19 04:01:08 -07:00
633f898f15
Skip failing tests when EC unavailable (RHEL)
2014-02-19 03:57:37 -07:00
6b5c9f6c5a
updated libmagic.patch
2014-02-19 11:20:24 +01:00
fdaf3996af
remove PHP_API_VERSION < 20100412 check
2014-02-19 11:01:42 +01:00
6d2cf0f2a4
expose correct libmagic version
2014-02-19 10:48:52 +01:00
4019531748
fixed tests in ext/fileinfo
2014-02-19 10:04:29 +01:00
967a6771d3
updated to libmagic-5.17
2014-02-19 10:02:36 +01:00
Daniel Lowrey