Commit Graph

91940 Commits

Author SHA1 Message Date
Jakub Zelenka
7ad1703413 Add overflow check for openssl_pkcs12_read 2015-08-20 19:29:54 +01:00
Anatol Belski
ef063dcb05 one new line too much 2015-08-20 13:32:30 +02:00
Anatol Belski
4ad0714d76 fork test 2015-08-20 13:32:29 +02:00
Nikita Popov
ef7d822c32 Remove path from test 2015-08-20 12:58:36 +02:00
Nikita Popov
186b0f3770 Don't allow leading \ in group use decl list
We recently added support for "use \Foo\{Bar}". This commit drops
support for the reverse "use Foo\{\Bar}". Those two got mixed up
in the initial implementation.
2015-08-20 11:47:43 +02:00
Ferenc Kovacs
4d7a8f119e Merge branch 'PHP-5.6'
* PHP-5.6:
  5.6.14 next
2015-08-20 09:57:49 +02:00
Ferenc Kovacs
c7c9858ba1 5.6.14 next 2015-08-20 09:56:47 +02:00
Christopher Jones
af76506830 Fixed bug #70308 (PDO::ATTR_PREFETCH is ignored) 2015-08-20 14:09:30 +10:00
Christopher Jones
f8ee809e22 Merge branch 'master' of https://git.php.net/repository/php-src 2015-08-20 13:57:39 +10:00
Christoph M. Becker
7373da78fe Merge branch 'pull-request/1471'
* pull-request/1471:
  add test for php_enchant_broker_free()
2015-08-19 22:27:39 +02:00
marcosptf
bf340ec417 add test for php_enchant_broker_free() 2015-08-19 22:25:29 +02:00
Christoph M. Becker
8e9e1b7da3 Merge branch 'pull-request/1472'
* pull-request/1472:
  This is a new test for enchant_broker_free_dict(). This function never was covered by .phpt
2015-08-19 22:16:42 +02:00
marcosptf
d085100a52 This is a new test for enchant_broker_free_dict().
This function never was covered by .phpt
2015-08-19 22:15:40 +02:00
Christoph M. Becker
533c11386f Merge branch 'pull-request/1475'
* pull-request/1475:
  testing enchant_broker_(g|s)et_dict_path
2015-08-19 21:59:40 +02:00
marcosptf
9a4b0dbe40 testing enchant_broker_(g|s)et_dict_path 2015-08-19 21:57:42 +02:00
Jakub Zelenka
c3f0c87564 Add overflow checks for openssl_pkey_* functions 2015-08-19 20:10:14 +01:00
Jakub Zelenka
478ecc674b Move overflow checks in openssl_pbkdf2 2015-08-19 20:06:58 +01:00
Anatol Belski
09970d8031 Revert "fix occasional fail in zip_close when target arc exists"
This reverts commit ed78d59a1d.
2015-08-19 19:00:53 +02:00
Anatol Belski
e6aa1fb249 fix config.w32 to include suitable lib files 2015-08-19 19:00:51 +02:00
Dmitry Stogov
30dcb2d662 Fixed typo 2015-08-19 19:15:30 +03:00
Christoph M. Becker
569023cde6 updated NEWS 2015-08-19 16:35:17 +02:00
Christoph M. Becker
361fb5baaa Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70303: Incorrect constructor reflection for ArrayObject
2015-08-19 16:33:40 +02:00
Christoph M. Becker
6c99cb2929 updated NEWS 2015-08-19 16:25:59 +02:00
Christoph M. Becker
484b92919b Fix #70303: Incorrect constructor reflection for ArrayObject
The first parameter of ArrayObject::__construct() is optional. Reflection
should reflect this.
2015-08-19 16:23:16 +02:00
Anatol Belski
026b41ba66 improve error message 2015-08-19 15:23:23 +02:00
Anatol Belski
ed78d59a1d fix occasional fail in zip_close when target arc exists 2015-08-19 15:23:21 +02:00
Dmitry Stogov
c97427ea8e Fixed typo in proper place 2015-08-19 15:45:39 +03:00
Dmitry Stogov
3350faf7e4 Fixed typo 2015-08-19 15:15:17 +03:00
Dmitry Stogov
71af54e5f6 Mark error and exception functions as "cold" (Matt's idea) 2015-08-19 14:40:56 +03:00
Xinchen Hui
066f6f6ad8 Merge branch 'PHP-5.6' 2015-08-19 18:41:46 +08:00
Xinchen Hui
b584b51398 Fixed bug #70290 (Null pointer deref (segfault) in spl_autoload via ob_start) 2015-08-19 18:41:28 +08:00
Dmitry Stogov
9b1570a378 Removed deprecated comments and added expectations (overloaded properties and array elements are less frequently used than regular ones) 2015-08-19 12:21:14 +03:00
Anatol Belski
1bb5479d06 update NEWS 2015-08-19 11:07:40 +02:00
Anatol Belski
0562ec85df Fix bug #70145 From field incorrectly parsed from headers 2015-08-19 11:05:35 +02:00
Anatol Belski
7f4ae19c80 added /guard:cf to release builds 2015-08-19 10:56:43 +02:00
Anatol Belski
3708d9c1b4 use the bare tarball filename for the stub, no path elements 2015-08-19 10:51:15 +02:00
Xinchen Hui
a44abef8b2 Update NEWs 2015-08-19 16:34:26 +08:00
Xinchen Hui
574e8966a4 Merge branch 'master' of https://github.com/marcioAlmada/php-src 2015-08-19 16:30:28 +08:00
Xinchen Hui
c89bd3f3c3 This bug is already fixed, but it's better to have a bug entry for the record 2015-08-19 10:47:08 +08:00
Christopher Jones
9047b567e3 Resolve build warnings. Bump ver. Better range check. Fix diffs 2015-08-19 10:42:53 +10:00
Bob Weinand
4df77a6c58 Fixed bug #70295 (Segmentation fault with setrawcookie) 2015-08-19 01:33:19 +02:00
Márcio Almada
7568d5cb89 fixes a syntactical inconsistency with group use and leading \
discussion: http://news.php.net/php.internals/87774
2015-08-18 19:23:58 -03:00
Anatol Belski
32462a8076 correct NEWS 2015-08-18 23:27:49 +02:00
Christoph M. Becker
3d8214a021 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #67604: The built windows documention refers to nonexistent dll
2015-08-18 21:26:09 +02:00
Christoph M. Becker
c12aa3c7ce Fix #67604: The built windows documention refers to nonexistent dll
Since quite a while the Windows builds ship with php5apache2_4.dll, but not
with other server modules. We fix some out-dated info in install.txt.
2015-08-18 21:21:28 +02:00
Jakub Zelenka
6a201b3651 Use macros for openssl overflow checks
It reduces code duplications
2015-08-18 20:17:04 +01:00
Jakub Zelenka
618c327a56 Fix possible overflow in openssl_pbkdf2
Especially key_length would lead to the crash if it overflowed
to the negative value.
2015-08-18 19:46:59 +01:00
Anatol Belski
000be61fb8 NEWS for next 2015-08-18 20:31:37 +02:00
Joe Watkins
784dd715e4 Fix mangled property names on anon classes 2015-08-18 16:37:38 +01:00
Côme Bernigaud
8acda9cad5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Patch from Rainer Jung to provide Solaris LDAP support

Conflicts:
	ext/ldap/ldap.c
2015-08-18 17:26:46 +02:00