1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Commit Graph

91900 Commits

Author SHA1 Message Date
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
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
Côme Bernigaud 54bd91175d Merge branch 'pull-request/1477' into PHP-5.6
* pull-request/1477:
  Patch from Rainer Jung to provide Solaris LDAP support
2015-08-18 17:17:28 +02:00
Côme Bernigaud 40befb943c Patch from Rainer Jung to provide Solaris LDAP support 2015-08-18 16:52:44 +02:00
Xinchen Hui af8b6ac310 Merge branch 'patch-gdbinit' of https://github.com/adsr/php-src 2015-08-18 22:51:09 +08:00
Xinchen Hui 3ea8c3cf1c Fixed memleak in Zend/tests/bug39297 2015-08-18 21:46:02 +08:00
Xinchen Hui e543769fa4 Fixed bug #70288 (Apache crash related to ZEND_SEND_REF) 2015-08-18 21:45:19 +08:00
Bob Weinand 34834c58fa Fixed bug #70293 (Crash with specific assertions and zend.assertions=-1) 2015-08-18 15:01:24 +02:00
Julien Pauli 9a138b47c9 Removed unused code 2015-08-18 14:33:04 +02:00
Bob Weinand a1c9c318ea Woops, accidentally made TS build fail... 2015-08-18 14:04:48 +02:00
Bob Weinand 501407aa49 Revert fix for nicer truncation on log_errors_max_len 2015-08-18 14:01:18 +02:00
Christoph M. Becker 1b5e87a579 Fix #70289: Different sort in php7 (and hhvm) compared to php5
We add a respective note to UPGRADING. Furthermore, as renaming of zend_qsort()
and the new zend_insert_sort() are irrelevant for user-land, we move this
info to UPGRADING.INTERNALS.
2015-08-18 13:44:14 +02:00
Xinchen Hui 22eaa995ee Lost this entry while merging 2015-08-18 19:12:52 +08:00
Xinchen Hui 75198c7371 Merge branch 'master' of git.php.net:php-src 2015-08-18 19:07:26 +08:00
Bob Weinand c83cbdf6ce Better fix for exception traces truncation with anon classes 2015-08-18 12:48:06 +02:00
Xinchen Hui dca6d1027a Fixed bug #70272 (Segfault in pdo_mysql) 2015-08-18 18:33:07 +08:00
Xinchen Hui 8df3461086 Improved fix for bug #70262 2015-08-18 18:07:31 +08:00
Xinchen Hui cf9cdf97db Merge branch 'master' of git.php.net:php-src 2015-08-18 18:07:25 +08:00
Xinchen Hui 14ea398d78 It should not be skip 2015-08-18 18:04:26 +08:00
Xinchen Hui 685fee75a5 Skip the test with valgrind 2015-08-18 18:03:34 +08:00
Dmitry Stogov d9a9b8572b Revert "Do not truncate exception traces upon anon class name"
This reverts commit b0c77fb80c.
2015-08-18 12:03:04 +03:00
Michael Wallner 17fc5cc65d fix inheritance of internal interfaces with constants 2015-08-18 08:20:12 +02:00
Michael Wallner e6e5defb31 fix printzv (refcount) 2015-08-18 08:20:12 +02:00
Bob Weinand b0c77fb80c Do not truncate exception traces upon anon class name 2015-08-18 03:27:56 +02:00
Anatol Belski c042c64c43 fix test
This fail has nothing together with any changes in run-tests.php
Using run-tests.php from the 5.5 branch brings the same result. So
merely it is about how PHP7 handles and buffers errors.
2015-08-17 23:12:50 +02:00
Anatol Belski 94e272f1b3 TSRM_TLS should be usable in NTS build 2015-08-17 23:12:49 +02:00
Christoph M. Becker d28abb2da2 no need to skip this test if no dictionaries are installed 2015-08-17 21:43:28 +02:00
Christoph M. Becker c3a303d431 Merge branch 'pull-request/1473'
* pull-request/1473:
  new test for enchant pwl file
2015-08-17 21:42:42 +02:00
marcosptf 3b004baaaa new test for enchant pwl file 2015-08-17 21:28:37 +02:00
Jakub Zelenka c4a98e876c Check and use correct signature_len type for EVP_VerifyFinal 2015-08-17 18:43:02 +01:00
Christoph M. Becker b28758f253 updated NEWS 2015-08-17 19:35:10 +02:00
Christoph M. Becker 07c1b641b5 fixed changed error message in test 2015-08-17 19:33:49 +02:00
Christoph M. Becker 61591ea636 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #70277: new DateTimeZone($foo) is ignoring text after null byte

Resolved conflicts:
	ext/date/php_date.c
2015-08-17 19:28:46 +02:00
Christoph M. Becker 3ed58fb5d7 updated NEWS 2015-08-17 17:27:13 +02:00
Julien Pauli aae9004ebd Removed dead code 2015-08-17 17:18:25 +02:00
Julien Pauli 5f54027d04 Renamed struct member
<resolv.h> has a #define for _res which makes compilation
 fail if included before php_output.h
2015-08-17 16:25:03 +02:00
Christoph M. Becker bb057498f7 Fix #70277: new DateTimeZone($foo) is ignoring text after null byte
The DateTimeZone constructors are not binary safe. They're parsing the timezone
as string, but discard the length when calling timezone_initialize(). This
patch adds a tz_len parameter and a respective check to timezone_initialize().
2015-08-17 15:58:37 +02:00
Dmitry Stogov ce89fd9758 Fixed bug #70262 (Accessing array crashes PHP 7.0beta3) 2015-08-17 12:58:14 +03:00
Dmitry Stogov 2d475eb943 Fixed tests on 32-bit systems 2015-08-17 12:54:33 +03:00
Derick Rethans 9a895396c9 Merge branch 'PHP-5.6' 2015-08-16 21:27:50 +01:00
Derick Rethans b010a9d846 Fixed sorting order
It needs to match the strcasecmp in parse_tz.c.
2015-08-16 21:27:07 +01:00
Derick Rethans cdaf057adb Updated to version 2015.6 (2015f) 2015-08-16 21:26:12 +01:00