php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 23:23:03 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,356 Commits 547 Branches 1,481 Tags
a031dc06d9b903705c7dd433d1361ba265ee4dfa
Commit Graph

78356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lowrey
a031dc06d9 Add openssl.cafile ini check when loading cainfo 2014-02-25 09:59:13 -07:00
Daniel Lowrey
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
Andrey Hristov
aad7b72472 Use API instead of directly acessing the structure 2014-02-25 17:39:06 +02:00
Anatol Belski
60ed3f78bd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed macro
 2014-02-24 10:13:11 +01:00
Anatol Belski
bca0e5edd5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed macro
 2014-02-24 10:12:50 +01:00
Anatol Belski
c6a4a7cad6 fixed macro 2014-02-24 10:12:18 +01:00
Paul Annesley
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
Johannes Schlüter
5c8a0c92d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-23 14:57:21 +01:00
Johannes Schlüter
2198bbce86 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-23 14:56:32 +01:00
Johannes Schlüter
3f258e6b46 Make sure value is initialized 2014-02-23 14:55:29 +01:00
Johannes Schlüter
756ee95605 We can't dereference dbh if it is NULL 2014-02-23 14:18:24 +01:00
Anatol Belski
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
Daniel Lowrey
865a41a6a3 More openssl UPGRADING updates 2014-02-21 12:54:37 -07:00
Daniel Lowrey
c3d76441d5 Fix build against older OpenSSL libs 2014-02-21 12:16:23 -07:00
Daniel Lowrey
58e3fcf54f Update NEWS/UPGRADING with openssl additions 2014-02-21 11:40:39 -07:00
Daniel Lowrey
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
Daniel Lowrey
b6edbd5897 Mitigate client-initiated SSL renegotiation DoS 2014-02-21 06:31:56 -07:00
Anatol Belski
f51555ca58 C89 compat 2014-02-21 11:23:42 +01:00
Dmitry Stogov
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
Dmitry Stogov
851f362882 Added information about interned strings usage 2014-02-21 12:43:42 +04:00
Dmitry Stogov
aebfc519ea Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated opcache version
 2014-02-21 12:06:35 +04:00
Dmitry Stogov
f06b3432c8 Updated opcache version 2014-02-21 12:04:42 +04:00
Dmitry Stogov
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
Dmitry Stogov
884bbcd537 Added function opcache_is_script_cached(). (Danack) 2014-02-21 11:59:14 +04:00
Daniel Lowrey
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
Daniel Lowrey
9f94e0b51c Improve OpenSSL compile flag compatibility, minor updates 2014-02-20 17:23:34 -07:00
Daniel Lowrey
3a9829af20 Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests 2014-02-20 17:10:06 -07:00
Daniel Lowrey
d0c9207cff Improve server forward secrecy, refactor client SNI 2014-02-20 17:10:06 -07:00
Daniel Lowrey
742fc5fb35 Add 'honor_cipher_order' server context option 2014-02-20 17:10:06 -07:00
Daniel Lowrey
081c8e9d92 Add 'capture_session_meta' context option 2014-02-20 17:10:06 -07:00
Daniel Lowrey
b98b093d73 Disable TLS compression by default in both clients and servers 2014-02-20 17:10:06 -07:00
Daniel Lowrey
b9ba011c0f Release ssl buffers 2014-02-20 17:10:06 -07:00
Daniel Lowrey
df6bfe3be2 Add openssl_get_cert_locations() function 2014-02-20 17:10:06 -07:00
Daniel Lowrey
258d04df5c Explicitly set cert verify depth if not specified 2014-02-20 17:10:06 -07:00
Daniel Lowrey
225f534b1a Strengthen default cipher list 2014-02-20 17:10:06 -07:00
Anatol Belski
5d0d88d1f2 fixed path separator in the tests 2014-02-21 00:23:01 +01:00
Sara Golemon
14c08ea362 Add more tests for __debugInfo() and fix leak 2014-02-20 12:10:00 -08:00
Anatol Belski
b67c8b8603 updated libmagic.patch for 5.6+ 2014-02-20 19:05:59 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
ce1fd72776 updated libmagic.patch in 5.4/5 2014-02-20 19:00:05 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
10eb007070 fixed leak introduced after CVE/upgrade 2014-02-20 18:53:53 +01:00
Bob Weinand
fe3c8de9d5 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-20 17:49:45 +01:00
Bob Weinand
ca313caa4b Merge branch 'PHP-5.4' into PHP-5.5 2014-02-20 17:48:38 +01:00
Bob Weinand
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
Xinchen Hui
c0d26bb138 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-20 11:19:52 +08:00
Yasuo Ohgaki
3fa164c24b Update pgsql document 2014-02-20 10:44:18 +09:00
Anatol Belski
47204c6341 some missing pieces for __debugInfo 2014-02-20 02:07:34 +01:00