clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,178 Commits 491 Branches 1,363 Tags 844 MiB
8d7003f708
Commit Graph

38773 Commits

Author SHA1 Message Date
Anatol Belski
8d7003f708 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
  Add entry for bug #69354, fixed in 5.5.25
  Add CVE for bugs in 5.6.9
  Add entry about PCRE upgrade (rev 95fa7279)
  Add CVE for bugs in 5.5.25

Conflicts:
	ext/phar/tests/bug69441.phpt
 2015-05-22 21:32:40 +02:00
Anatol Belski
0bc3a74334 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-05-22 21:27:19 +02:00
Anatol Belski
d9c266f4c9 fix test 
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
 2015-05-22 21:25:52 +02:00
Xinchen Hui
50688e3984 Forgot the test for bug #69688 2015-05-22 11:50:55 +08:00
Xinchen Hui
95da6b76f3 Fixed test 2015-05-22 11:49:15 +08:00
Xinchen Hui
8c0ba65d6a Fixed bug #69688 (segfault with eval and opcache fast shutdown) 2015-05-22 11:48:13 +08:00
Anthony Ferrara
ed4052f1d5 Fixed bug #69686 password_verify reports back error on PHP7 will null string. 
The deprecation of DES salts created a warning when trying to verify them with password_hash. This bug fix adds a quiet mode to php_crypt() which is used by password_verify.
 2015-05-21 17:12:51 -04:00
Dmitry Stogov
f186d4b8b1 Fixed build with DEBUG_COMPACT_LITERALS=1 2015-05-21 17:57:06 +03:00
Remi Collet
aec039cc6e Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative
 2015-05-21 14:07:14 +02:00
Remi Collet
17d5ebe76e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69680 (phar symlink in binary directory broken).
  Make the phar symlink relative
 2015-05-21 14:06:26 +02:00
ponce
c3d983f3af Make the phar symlink relative 
or we got a symlink pointing to the build files
thanks also to remicollet
 2015-05-21 14:03:18 +02:00
Anatol Belski
4fe938b0a9 remove duplicated declaration, fix build 2015-05-21 10:56:14 +02:00
Anatol Belski
fc94fb3e5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  added missing GLOB_BRACE support check
  added SKIPIF section to test to make sure that GLOB_BRACE is supported
  fix #69628: complex GLOB_BRACE fails on Windows
  added PHPT to check for bug #69628
 2015-05-21 09:47:30 +02:00
Christoph M. Becker
96629091a6 added missing GLOB_BRACE support check 2015-05-21 09:44:18 +02:00
Christoph M. Becker
6895ae4553 added SKIPIF section to test to make sure that GLOB_BRACE is supported 2015-05-21 09:44:17 +02:00
Christoph M. Becker
90aee01c85 added PHPT to check for bug #69628 2015-05-21 09:44:14 +02:00
Anatol Belski
eef762d576 Merge branch 'pull-request/1278' 2015-05-21 08:52:41 +02:00
Anatol Belski
360d8fd712 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix handling VAR vs VAR= in putenv
 2015-05-21 08:22:30 +02:00
Anatol Belski
ad4d022bdf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix handling VAR vs VAR= in putenv
 2015-05-21 08:21:53 +02:00
Anatol Belski
75286ece1a fix handling VAR vs VAR= in putenv 
using _putenv_s eliminates behavior diff in TS/NTS
 2015-05-21 08:19:54 +02:00
Bob Weinand
9b6bb2d451 Add support for string dictionaries, fix array dictionaries ({de,in}flate) 2015-05-21 04:17:17 +02:00
Dmitry Stogov
0da206e4b7 Set proper type_info flags. 2015-05-21 00:51:34 +03:00
Dmitry Stogov
cf6ac5c665 Fixed SHM+FILE cache with opcache.protect_memory=1 2015-05-20 23:33:55 +03:00
Dmitry Stogov
5ff5201543 Improved script copyining from SHM to process memory 2015-05-20 23:12:04 +03:00
Christoph M. Becker
99d7852d18 added missing GLOB_BRACE support check 2015-05-20 20:23:21 +02:00
Christoph M. Becker
b654aa4606 added SKIPIF section to test to make sure that GLOB_BRACE is supported 2015-05-20 18:39:07 +02:00
Nikita Popov
b081da657e Expose pdo stmt ctor args to gc 
These very commonly contain a reference to the PDO object itself.
 2015-05-20 18:28:09 +02:00
Nikita Popov
4e03ba4a6e Add GC support for ArrayObject 
gc_024 test changes because the array that ArrayObject holds is
now counted separately from the ArrayObject.
 2015-05-20 18:28:09 +02:00
Anatol Belski
8dbd39d96e fixed test 2015-05-20 15:56:16 +02:00
Kalle Sommer Nielsen
e634f07f1e Merge branch 'master' of https://git.php.net/push/php-src 2015-05-20 15:50:00 +02:00
Kalle Sommer Nielsen
22fc3baa7a Windows support for getrusage() 
* See getrusage.c/h for implementation details and limitations
* Tests passes and have had their SKIPIF updated
* psapi.lib is now linked to by default
 2015-05-20 15:45:37 +02:00
Remi Collet
e0cd1823ec Merge branch 'PHP-5.6' 
* PHP-5.6:
  move test
 2015-05-20 14:03:01 +02:00
Remi Collet
59a78d48f0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move test
 2015-05-20 14:02:25 +02:00
Remi Collet
3be4e5d71a move test 2015-05-20 14:02:13 +02:00
Xinchen Hui
c4129694a8 Merge branch 'patch-5' of https://github.com/ovr/php-src 2015-05-20 16:56:28 +08:00
Remi Collet
f7bfeac419 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix new test
 2015-05-20 08:31:46 +02:00
Remi Collet
f228bc5230 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix new test
 2015-05-20 08:30:44 +02:00
Remi Collet
716fe10d97 fix new test 2015-05-20 08:30:27 +02:00
Remi Collet
8ad4a21c44 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS 5.6
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)

Conflicts:
	ext/pgsql/pgsql.c
 2015-05-20 08:14:02 +02:00
Remi Collet
e41a2009d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)
 2015-05-20 08:11:24 +02:00
Remi Collet
2cc4e69cc6 Fixed Bug #69667 segfault in php_pgsql_meta_data 
Incomplete fix for #68741
 2015-05-20 08:08:41 +02:00
Dmitry Patsura
b6f8b4e949 [Math] ceil, floor added FAST_ZPP parameters pass 2015-05-19 21:19:13 +08:00
Dmitry Stogov
6c8d49b6b0 Improved hash table copying 2015-05-19 13:22:58 +03:00
Kalle Sommer Nielsen
27b83079fe This shouldn't have been a part of the previous commit 2015-05-19 12:20:25 +02:00
Kalle Sommer Nielsen
dd527806e9 * Make ext/dba compile with newer versions of Oracle's Berkeley (in my case 6.1) 
* Make the db3 driver work with 4.3+
 2015-05-19 12:12:24 +02:00
Anatol Belski
f378b9a998 fix test title 2015-05-18 22:37:31 +02:00
Anatol Belski
6fe4f18dcd fork test for ICU >= 55.1 compat 2015-05-18 22:37:29 +02:00
Anatol Belski
8af0de914f sync test with exception currently thrown 2015-05-18 22:37:28 +02:00
Anatol Belski
d3515bdef0 fork test for ICU >= 55.1 compat 2015-05-18 22:37:26 +02:00
Anatol Belski
bb27f4ca8b fork test for ICU >= 55.1 compat 2015-05-18 22:37:25 +02:00