a97ae8bc06
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:53:40 +04: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
3f258e6b46
Make sure value is initialized
2014-02-23 14:55:29 +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
865a41a6a3
More openssl UPGRADING updates
2014-02-21 12:54:37 -07:00
c3d76441d5
Fix build against older OpenSSL libs
2014-02-21 12:16:23 -07:00
58e3fcf54f
Update NEWS/UPGRADING with openssl additions
2014-02-21 11:40:39 -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
dcf27a1f6f
Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into PHP-5.6
...
* 'improved-tls-defaults' of https://github.com/rdlowrey/php-src :
Improve OpenSSL compile flag compatibility, minor updates
Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
Improve server forward secrecy, refactor client SNI
Add 'honor_cipher_order' server context option
Add 'capture_session_meta' context option
Disable TLS compression by default in both clients and servers
Release ssl buffers
Add openssl_get_cert_locations() function
Explicitly set cert verify depth if not specified
Strengthen default cipher list
2014-02-20 17:35:44 -07: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
5d0d88d1f2
fixed path separator in the tests
2014-02-21 00:23:01 +01:00
14c08ea362
Add more tests for __debugInfo() and fix leak
2014-02-20 12:10:00 -08:00
b67c8b8603
updated libmagic.patch for 5.6+
2014-02-20 19:05:59 +01:00
0746e6af08
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated libmagic.patch in 5.4/5
2014-02-20 19:01:09 +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
fe3c8de9d5
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-20 17:49:45 +01:00
ca313caa4b
Merge branch 'PHP-5.4' into PHP-5.5
2014-02-20 17:48:38 +01:00
afa03a470e
Use nicer output for characters < 32 and > 126 in exception strings
...
Using question marks might confuse more than it helps.
Users are wondering what happened to their string...
2014-02-20 17:39:58 +01:00
c0d26bb138
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-20 11:19:52 +08:00
3fa164c24b
Update pgsql document
2014-02-20 10:44:18 +09:00
47204c6341
some missing pieces for __debugInfo
2014-02-20 02:07:34 +01: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
3e82ff615f
updated NEWS
2014-02-19 11:28:55 +01:00
Paul Annesley