Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nikic/php-src
base: splat
...
head fork: nikic/php-src
compare: namedParams
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 29, 2014
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed zend.multibyte tests partially
3182660
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed zend.multibyte tests partially
a6ac64b
@remicollet remicollet Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
php_ini_scanned_path, from --with-config-file-scan-dir option or
from PHP_INI_SCAN_DIR environment variable allow a single path.

In some case it could be useful to allow multiple.

In the proposed patch, multiple paths are allow, using syntax inspired
from Unix MANPATH (: separated list, empty string for builtin value).

For example, this allow to use:
PHP_INI_SCAN_DIR=/foo/php.d:/bar/php.d   php
PHP_INI_SCAN_DIR=:/myproject/php.d       php
PHP_INI_SCAN_DIR=/myproject/php.d:       php

Real use case: in SCL for dependent collections where each collection
provides a separate tree for extensions, libraries and ini files.
da84f3a
@remicollet remicollet Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
0fad6db
@remicollet remicollet zip extension version 1.12.4 f06f4c9
Andrey Hristov Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
7807d7d
Andrey Hristov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 253a66c
Commits on Jan 30, 2014
@rdlowrey rdlowrey Fixed build breakage from b4b4d96 43432c1
Yasuo Ohgaki Fixed bug data->fd not set to -1 for open_basedir failure. f5e097d
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug data->fd not set to -1 for open_basedir failure.
b1c0614
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
53e3023
@smalyshev smalyshev tests still failing, so xfail for now until fixed 770aeeb
@smalyshev smalyshev tests still failing, so xfail for now until fixed c24f114
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  tests still failing, so xfail for now until fixed
e79b54c
@smalyshev smalyshev tests still failing, so xfail for now until fixed 8071de3
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
1207461
@pankdm pankdm Make html_table_gen consistent with html_table.h
In commit 6dabd7d the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
179e459
@pankdm pankdm Make html_table_gen consistent with html_table.h
In commit 6dabd7d the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
cb7af76
Commits on Jan 31, 2014
@rdlowrey rdlowrey Use master-agnostic zend_is_true checks 58293fb
Commits on Feb 01, 2014
@rdlowrey rdlowrey Remove #if PHP_VERSION_ID version checks 05c309f
Commits on Feb 02, 2014
@krakjoe krakjoe Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into…
… PHP-5.6
a4a120d
@krakjoe krakjoe remove use of zend directly, avoid leaks/bugs in modules etc a58c74f
@krakjoe krakjoe update version 4a96a75
@krakjoe krakjoe better use of tmpnam/mkstemp 9e84124
@krakjoe krakjoe woops 6a6bec4
@krakjoe krakjoe another patch from upstream e8519bc
@krakjoe krakjoe clean symbols 407d761
@krakjoe krakjoe windows 148d7cc
Commits on Feb 03, 2014
@Tyrael Tyrael mention the openssl SPKAC functions commited to master before branchi…
…ng out 5.6. see php#267
5d3a2fd
Commits on Feb 04, 2014
@weltling weltling pcre upgraded to 8.34 23cb7bd
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  pcre upgraded to 8.34
353e264
@weltling weltling pcre tests go with 8.34 upgrade ab32d36
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  pcre tests go with 8.34 upgrade
f2d42e1
@weltling weltling updated NEWS 465d5db
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
b052ae9
@weltling weltling updated NEWS 78815f9
Commits on Feb 05, 2014
@rdlowrey rdlowrey Fixed SNI failure from missing Z_STRVAL_PP 99fa590
@weltling weltling move the NEWS entry into the right section 918f626
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move the NEWS entry into the right section
3c1ba1f
@weltling weltling adapt test to curl 7.35.0 upgrade
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
71ebc0a
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  adapt test to curl 7.35.0 upgrade
fd87b38
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
5180425
@bjori bjori Fix year 1e0fdf0
@bjori bjori Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix year
b855367
@bjori bjori Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix year
ae310e0
@weltling weltling fix tests for ICU >= 52.1 e8f16c1
@weltling weltling more tests for ICU >= 52.1 compat 65f9380
Commits on Feb 06, 2014
@weltling weltling update libs_version.txt e41059c
@weltling weltling updated libs_version.txt 6267c40
@weltling weltling updated libs_version.txt 10a806b
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update libs_version.txt

Conflicts:
	win32/build/libs_version.txt
8605702
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt
  update libs_version.txt
b33060a
@Tyrael Tyrael add NEWS block for 5.6.0alpha3 df76fd8
@datibbaw datibbaw add T_POW (**) operator
Fixed recognition of the operator

Added opcode, still doing multiply instead of pow()

opcode now always returns int(42)

The right answer, but always a float

Yanked code from pow() implementation.

Should not handle negative long as exponent ourselves

Added test cases from pow()

Moved precedence higher than '~'

Added GMP operator overloading

Added ZEND_ASSIGN_POW (**=) operator.

Added pow() as a language construct.

Adjusted test cases for changed precedence.

Reduced pow() to shell function around ZEND_API pow_function()

Reduced test case to only contain edge cases
Added overloading test case

Moved unary minus above T_POW

Revert "Added pow() as a language construct."

Bad bad bad idea.

This reverts commit f60b98c.

Reverted unary minus behaviour due to previous revert.
Convert arrays to int(0)
Exponent with array as a base becomes int(0)

Rebase against master

Fixed tokenizer test case
aff56f3
@bwoebi bwoebi Added information in NEWS and UPGRADING 7a022da
@jpauli jpauli 5.5.9 now released 2c34d81
@bwoebi bwoebi Fixed memory leak in pow operator 363ff60
Commits on Feb 08, 2014
Nuno Lopes fix regex to detect valgrind version
New PCRE version got stricter
62404e7
Nuno Lopes fix regex to detect valgrind version
New PCRE version got stricter
f46200b
Commits on Feb 09, 2014
@matslindh matslindh Replace old SVN references to Git 6188674
@derickr derickr Rename timelib_get_zone to timelib_parse_zone and export. e196dce
@derickr derickr Implemented feature #45528: Allow the DateTimeZone constructor to acc…
…ept timezones per offset too.
d676396
@derickr derickr Merge branch 'PHP-5.5' into PHP-5.6 9fa6bcd
Commits on Feb 10, 2014
Christopher Jones Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name() 2cbd857
Commits on Feb 11, 2014
Christopher Jones Fix merge 9da5118
@derickr derickr Fixed ZTS and added fix to NEWS. 39e721c
@derickr derickr Merge branch 'PHP-5.5' into PHP-5.6 75f59e1
@derickr derickr Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 45772c7
Commits on Feb 12, 2014
@Tyrael Tyrael update the alpha2 release date 06bbfe1
Commits on Feb 13, 2014
Yasuo Ohgaki Implement RFC https://wiki.php.net/rfc/default_encoding cbd108a
@Tyrael Tyrael mention ldap_modify_batch() 2537fdf
@Tyrael Tyrael move the peer verification NEWS entry to the alpha2 block, as it was …
…pushed after alpha1
91fecd7
Yasuo Ohgaki Update NEWS and UPGRADING 71b8f59
Commits on Feb 14, 2014
@vlajos vlajos a few typofixes 35101e9
@kaplanlior kaplanlior Merge branch 'PHP-5.4' into PHP-5.5 c09bd9d
@vlajos vlajos a few typofixes f982969
@kaplanlior kaplanlior Merge branch 'PHP-5.5' into PHP-5.6 23d952e
@vlajos vlajos a few typofixes a7ec000
@rdlowrey rdlowrey Fix segfault accessing context when no context assigned 8582353
@rdlowrey rdlowrey Updated NEWS 81c29af
@rdlowrey rdlowrey Fix test broken if openssl is compiled without sslv2 f073588
@rdlowrey rdlowrey Bug #47030 (separate host and peer verification) ce8dc0e
@rdlowrey rdlowrey Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into …
…PHP-5.6

* 'bug-47030' of https://github.com/rdlowrey/php-src:
  Bug #47030 (separate host and peer verification)
734d887
Commits on Feb 15, 2014
@mk-j mk-j Fix for bug66501 - "key type not supported in this PHP build" 19524fc
@rdlowrey rdlowrey Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix for bug66501 - "key type not supported in this PHP build"
65adb74
@rdlowrey rdlowrey Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix for bug66501 - "key type not supported in this PHP build"
b60cb2b
@rdlowrey rdlowrey Update NEWS 5cc851e
@rdlowrey rdlowrey Update NEWS cf0741f
@rdlowrey rdlowrey Update NEWS 2976f7d
Yasuo Ohgaki Refactor and cleanup. WS is cleaned up. Use -b if it is needed.
Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.
832c21c
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5 6e0b8b4
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6 5ff9089
Yasuo Ohgaki Update NEWS 7ce88b2
Yasuo Ohgaki Update NEWS fbb1827
@felipensp felipensp - Fix ZTS build when HAVE_PQESCAPELITERAL is not set 9d84f6c
@felipensp felipensp Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
a65a546
@felipensp felipensp Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Update NEWS
8cec20a
@johannes johannes Move static functions further up so they are delared efore being used. 1fd53fd
Yasuo Ohgaki Revise encoding blacklist 9f25154
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revise encoding blacklist
8c9fd8f
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revise encoding blacklist
53f34bc
Yasuo Ohgaki Refactor build_tablename() 6f14b5a
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Refactor build_tablename()
f9537c2
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Refactor build_tablename()
a12c896
@realityking realityking Declare a number of functions as variadic. 417dbfb
@nikic Remove XFAIL from a test
Everything looks to be working fine, the test is just wrong.
INF equals INF as per IEEE 754.
7d5f806
Commits on Feb 16, 2014
Yasuo Ohgaki Fixed possbile injections against pg_insert()/pg_delete()/pg_update()…
…/pg_select()
f275fdc
Yasuo Ohgaki Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
3fcdecf
Yasuo Ohgaki Update NEWS f7f524a
Yasuo Ohgaki Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
3f4134c
Yasuo Ohgaki Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Remove XFAIL from a test
  Declare a number of functions as variadic.
53daf94
Yasuo Ohgaki EXPERIMENTAL flags for pg_select/pg_insert/pg_update/pg_delete are re…
…moved.

Use string escape for exotic types that allows to handle any data types. i.e. Array, JSON, JSONB, etc will work.
Add escape only query for better performance which removes meta data look up. Limitations forced by pg_convert() can be avoided with this. PGSQL_DML_ESCAPE constant is added for it.
5685451
Yasuo Ohgaki Update NEWS and UPGRADING a59559a
Yasuo Ohgaki Add PGSQL_DML_ESCPE d4bc18b
Yasuo Ohgaki It seems travis needs ending >? 4a2b392
Yasuo Ohgaki Travis has old PostgreSQL server. Avoid test error. 170db1c
@rdlowrey rdlowrey Fix Bug #65538 (cafile now supports stream wrappers) c7220dc
@weltling weltling updated pgsql/config.w32
keep track with the latest changes for postgles 9.3 compatibility
a9c0d31
@rdlowrey rdlowrey Add tests for Bug #65538 2a83295
Yasuo Ohgaki Implement FR #41146 - Add "description" with exteneded flag pg_meta_d…
…ata().

pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.
5fd6365
Yasuo Ohgaki Imprement FR #25854 Return value for pg_insert should be resource ins…
…tead of bool
d8aa130
Commits on Feb 17, 2014
Yasuo Ohgaki Add pgsql related change information to NEWS and UPGRADING e5ec5fc
Scott MacVicar [libxml] Unit test for libxml_disable_entity_loader()
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
1f3af9c
Scott MacVicar imagettftext() uses the last charactermap it found and not the one yo…
…u want

Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.

In an ideal world we can probably iterate through at font write time.

Test Plan:
See said unit test, it's Apache Licensed font included
796bfb0
@weltling weltling simplify the metadata part 6877af3
@jpauli jpauli Export JsonSerializable Interface (bug #65753) 786234d
@jpauli jpauli Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Export JsonSerializable Interface (bug #65753)
baafdad
@jpauli jpauli Export JsonSerializable Interface (bug #65753) 8a1d248
@jpauli jpauli Updated NEWS for #65753 b04159e
@jpauli jpauli Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Updated NEWS for #65753
641a0c8
@jpauli jpauli Updated NEWS for #65753 66f76ec
@jpauli jpauli Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS for #65753
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)
e19e266
@jpauli jpauli Updated NEWS for #65753 0bc96ef
Andrey Hristov Move code out, that handles the actual structure to be used for the d…
…ecoded

data. Will make it easier to add different structures
b2cd56c
Andrey Hristov remove dead code 3e59f04
@rdlowrey rdlowrey Fixed broken build when EC unavailable a80cec1
Commits on Feb 18, 2014
@rdlowrey rdlowrey Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed broken build when EC unavailable
bd9aa18
@rdlowrey rdlowrey Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed broken build when EC unavailable
4e4d319
@sgolemon sgolemon Add __debugInfo() magic method
class Foo {
  private $val = 'Random, meaningless data';

  public function count() { return 42; }

  public function __debugInfo() {
    return ['count' => $this->count()];
  }
}

$f = new Foo;
var_dump($f);
1e752ce
@smalyshev smalyshev update NEWS b79d228
@smalyshev smalyshev 5.4.27 now c612440
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.27 now
  update NEWS

Conflicts:
	configure.in
	main/php_version.h
58b7f21
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.27 now
  update NEWS
140769a
@remicollet remicollet Fixed Bug #66731 file: infinite recursion
Upstream commit (available in file-5.17)

file/file@3c08156
file/file@cc9e74d
89f864c
@remicollet remicollet NEWS 9f449df
@remicollet remicollet Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fixed Bug #66731 file: infinite recursion
bdd65b5
@remicollet remicollet NEWS a6ad3a5
@remicollet remicollet Set fileinfo version to 1.0.5 (as in php 5.4, no diff) bd8cd98
@remicollet remicollet Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
aa84d90
@jpauli jpauli 5.5.11 next for NEWS be35493
@jpauli jpauli 5.5.11-dev next 0afcbb0
@smalyshev smalyshev update news with CVE ee4b389
@smalyshev smalyshev MErge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update news with CVE
1cc5d10
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

Conflicts:
	configure.in
	main/php_version.h
54b1829
@weltling weltling updated libmagic.patch a289b37
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated libmagic.patch
8dd99dd
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
e95a292
Commits on Feb 19, 2014
@weltling weltling updated to libmagic-5.17 967a677
@weltling weltling fixed tests in ext/fileinfo 4019531
@weltling weltling expose correct libmagic version 6d2cf0f
@weltling weltling remove PHP_API_VERSION < 20100412 check fdaf399
@weltling weltling updated libmagic.patch 6b5c9f6
@weltling weltling updated NEWS 3e82ff6
@rdlowrey rdlowrey Skip failing tests when EC unavailable (RHEL) 633f898
@rdlowrey rdlowrey Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Skip failing tests when EC unavailable (RHEL)

Conflicts:
	ext/openssl/openssl.c
a7d3606
@rdlowrey rdlowrey Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Skip failing tests when EC unavailable (RHEL)
d9036d1
@rdlowrey rdlowrey 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)
e272225
@bradleyboy bradleyboy 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.
143bb29
Commits on Feb 20, 2014
@weltling weltling some missing pieces for __debugInfo 47204c6
Yasuo Ohgaki Update pgsql document 3fa164c
@laruence laruence Merge branch 'PHP-5.5' into PHP-5.6 c0d26bb
@bwoebi bwoebi 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...
afa03a4
@bwoebi bwoebi Merge branch 'PHP-5.4' into PHP-5.5 ca313ca
@bwoebi bwoebi Merge branch 'PHP-5.5' into PHP-5.6 fe3c8de
@weltling weltling fixed leak introduced after CVE/upgrade 10eb007
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed leak introduced after CVE/upgrade
6d4d415
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed leak introduced after CVE/upgrade
67d281f
@weltling weltling updated libmagic.patch in 5.4/5 ce1fd72
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated libmagic.patch in 5.4/5
e244e22
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch in 5.4/5
0746e6a
@weltling weltling updated libmagic.patch for 5.6+ b67c8b8
@sgolemon sgolemon Add more tests for __debugInfo() and fix leak 14c08ea
@weltling weltling fixed path separator in the tests 5d0d88d
Commits on Feb 21, 2014
@rdlowrey rdlowrey Strengthen default cipher list 225f534
@rdlowrey rdlowrey Explicitly set cert verify depth if not specified 258d04d
@rdlowrey rdlowrey Add openssl_get_cert_locations() function df6bfe3
@rdlowrey rdlowrey Release ssl buffers b9ba011
@rdlowrey rdlowrey Disable TLS compression by default in both clients and servers b98b093
@rdlowrey rdlowrey Add 'capture_session_meta' context option 081c8e9
@rdlowrey rdlowrey Add 'honor_cipher_order' server context option 742fc5f
@rdlowrey rdlowrey Improve server forward secrecy, refactor client SNI d0c9207
@rdlowrey rdlowrey Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests 3a9829a
@rdlowrey rdlowrey Improve OpenSSL compile flag compatibility, minor updates 9f94e0b
@rdlowrey rdlowrey Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/p…
…hp-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
dcf27a1
@dstogov dstogov Added function opcache_is_script_cached(). (Danack) 884bbcd
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
	NEWS
b9a87a5
@dstogov dstogov Updated opcache version f06b343
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated opcache version
aebfc51
@dstogov dstogov Added information about interned strings usage 851f362
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added information about interned strings usage

Conflicts:
	NEWS
31f5515
@weltling weltling C89 compat f51555c
@rdlowrey rdlowrey Mitigate client-initiated SSL renegotiation DoS b6edbd5
@rdlowrey rdlowrey Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src int…
…o PHP-5.6

* 'reneg-limit' of https://github.com/rdlowrey/php-src:
  Mitigate client-initiated SSL renegotiation DoS
5389d09
@rdlowrey rdlowrey Update NEWS/UPGRADING with openssl additions 58e3fcf
@rdlowrey rdlowrey Fix build against older OpenSSL libs c3d7644
@rdlowrey rdlowrey More openssl UPGRADING updates 865a41a
@weltling weltling 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.
5b6ef90
Commits on Feb 23, 2014
@johannes johannes We can't dereference dbh if it is NULL 756ee95
@johannes johannes Make sure value is initialized 3f258e6
@johannes johannes Merge branch 'PHP-5.4' into PHP-5.5 2198bbc
@johannes johannes Merge branch 'PHP-5.5' into PHP-5.6 5c8a0c9
Commits on Feb 24, 2014
@pda pda 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.
a97ae8b
@weltling weltling fixed macro c6a4a7c
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed macro
bca0e5e
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed macro
60ed3f7
Commits on Feb 25, 2014
Christopher Jones Reduce test noise in cross Oracle client <-> server version testing.
This change is already in PHP 5.6+
8cdefd3
Christopher Jones Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
593505f
Christopher Jones Reduce test noise on cross Oracle client <-> server version tests.
This fix is already in PHP 5.6+
ee7671a
Christopher Jones Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
a59ec5d
@pda pda 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.
6e15afd
@pda pda 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.
eb6941e
@tony2001 tony2001 add news entry 4d9c556
@tony2001 tony2001 add news entry e1b1ef0
Andrey Hristov Use API instead of directly acessing the structure aad7b72
@DaveRandom DaveRandom Add peer certificate verification on windows
Peer certificate verification on Windows using the native certificate store and the Windows API
480e4f8
@DaveRandom DaveRandom Update openssl tests with new server/client test harness d6fb7b8
@rdlowrey rdlowrey 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)
47b5873
@rdlowrey rdlowrey Add openssl.cafile ini check when loading cainfo a031dc0
@rdlowrey rdlowrey 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.
a4c7ab8
@rdlowrey rdlowrey Tolerate non-standard newlines when parsing stream CA files f8fe09d
@rdlowrey rdlowrey Merge branch 'windowsPeerVerification' of https://github.com/DaveRand…
…om/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
bd95716
@rdlowrey rdlowrey Remove test case invalidated by openssl.cafile accessibility change bab017d
@rdlowrey rdlowrey Update NEWS+UPGRADING (openssl) 781d0b9
Commits on Feb 26, 2014
@rdlowrey rdlowrey Prevent implicit function declaration when TLSEXT unavailable 2bc0dba
@weltling weltling kick redundant include
this is already present from php.h
82a98f6
@weltling weltling fix stdin reading in new openssl tests 56cbe04
@weltling weltling remove echo bcff8d1
@weltling weltling restored that test part in ext/openssl to enable notify/wait 9ab73c5
@Tyrael Tyrael add NEWS block for 5.6.0 beta1 2b34832
@Tyrael Tyrael Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add news entry
  add clear_env option to FPM config
d18089d
@Tyrael Tyrael Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add news entry
  add news entry
  add clear_env option to FPM config
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
2f5ba1e
@Tyrael Tyrael rearrange the NEWS blocks a bit da4c7af
@Tyrael Tyrael move the default encoding NEWS entry to alpha3, as it was pushed afte…
…r beta2 was tagged
44053a9
@nikic Introduce zend_function_call_entry structure
Instead of directly pushing the zend_function* onto the
function_call_stack, push this structure. This allows us to store
additional data on this stack.
cefa7f8
@nikic Store arg_num in fcall entry
Instead of storing the argument number in the znode of the parameter
list, store it in fcall->arg_num. This mainly cleans up the parameter
parsing code, which previously had to duplicate all rules (this
becomes more excessive as more features are added, e.g. named params
would already require a minimum of 14 rules...)
2eae187
@nikic Disallow use of positional args after unpacking
This commit disallows the use of trailing positional arguments
after argument unpacking was used. The following calls are no
longer valid:

    fn(...$array, $var);
    fn(...$array1, $var, ...$array2);

However, all of the following continue to be valid:

    fn($var, ...$array);
    fn(...$array1, ...$array2);
    fn($var, ...$array1, ...$array2);

The reason behind this change is a stack allocation issue pointed
out by Dmitry: As of PHP 5.5 the stack necessary for pushing
arguments is precomputed and preallocated, as such the individual
SEND opcodes no longer verify that there is enough stack space.
The unpacked arguments will occupy some of that preallocated
space and as such following positional arguments could write past
a stack page boundary.

An alternative resolution for this issue is to ensure that there
is enough space for the remaining arguments in the UNPACK opcode.
However making this allocation precise (rather than using a
conversative over-estimate) would require some effort. Given that
this particular aspect of the feature wasn't very popular in the
first place, it doesn't seem worth the effort.
d3b484d
@nikic Don't add num_additional_args in SEND opcodes
Now that trailing positional args are disallowed,
num_additional_args will always be zero in SEND opcodes (and
FUNC_ARG fetches).
95c73f9
@nikic Update stack size in tests/func/010.phpt
Stack size is 16K nowadays. Now the test takes a more reasonable
amount of time to run...
96d0bb7
Commits on Feb 27, 2014
@nikic Initial named args implementation 1f38d98
@nikic Cherry pick 7682dfc by stas
Minus whitespace changes, minus some things not relevant here. Not
carefully reviewed. Might contain some changes that do not apply
to my branch and need to be removed
0872deb