clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,275 Commits 494 Branches 1,367 Tags 788 MiB
59de6fb268
Commit Graph

97275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
59de6fb268 update NeWS 2016-07-25 09:52:21 +02:00
Christoph M. Becker
387847a0b2 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-25 02:03:54 +02:00
Christoph M. Becker
138fea83fe Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
 2016-07-25 02:02:54 +02:00
Christoph M. Becker
305bddb0ed Fix broken test case 
d28f1da introduced a test regression, due to potentially additional output
regarding FreeType support. We fix that by making the test more resilient.
 2016-07-25 02:00:37 +02:00
Christoph M. Becker
d55a773223 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-25 00:25:11 +02:00
Christoph M. Becker
4db4997ac5 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
 2016-07-25 00:16:21 +02:00
Christoph M. Becker
d28f1dae9d Fix broken test case 
The test claims that it would be "checking all the values in returned array",
but due to the use of %a it actually skipped elements. We fix that by using
%s instead.
 2016-07-25 00:13:44 +02:00
Xinchen Hui
3d33eb743d Update NEWS 2016-07-24 23:59:05 +08:00
Xinchen Hui
393d56f1e3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
 2016-07-24 23:58:50 +08:00
Xinchen Hui
ad96a052d9 Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd) 2016-07-24 23:58:22 +08:00
Anatol Belski
fcc9386578 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  regenerate date parser with re2c 0.15.3
  regenerate date parser with re2c 0.15.3
 2016-07-24 14:55:15 +02:00
Anatol Belski
da3995852e regenerate date parser with re2c 0.15.3 2016-07-24 14:53:53 +02:00
Anatol Belski
8eb94b6e32 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  regenerate date parser with re2c 0.15.3
 2016-07-24 14:51:59 +02:00
Anatol Belski
9cd23ff84f regenerate date parser with re2c 0.15.3 2016-07-24 14:50:10 +02:00
Xinchen Hui
9b34f44f41 Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src: (32 commits)
  fix compiler warning
  rework long path normalization stuf
  More tolerance in another IntlCalendar test
  Ensure session GC is not run during variation6.phpt
  add folds
  improve typedef and fix the fake function
  add missing cast
  Fix typos, previous version used reserver/reserverd/reserved
  Fixed bug #72625 realpath() fails on non canonical long path
  correct comment
  don't return long path prefix to script
  fix test
  fix test
  Fix #68712: suspicious if-else statements
  Fix copy&paste errors in gd_interpolation.c
  Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c
  Fix ClosedGeneratorException possibly thrown into wrong scope
  Fix for bug #54431
  Fix build
  Make sure TOKEN_PARSE mode is thread safe
  ...
 2016-07-24 11:03:49 +08:00
Xinchen Hui
a3a797dbd5 Fixed bug #72661 (ReflectionType::__toString crashes with iterable) 2016-07-24 11:01:19 +08:00
Anatol Belski
addb2e22b3 fix compiler warning 2016-07-24 03:51:53 +02:00
Anatol Belski
4acde210fd rework long path normalization stuf 
Simplify, set error codes, ensure 32-bit is ok as well. The
canonicalization part is still an issue on win7 as the API
is missing there. However a partial improvement is reached
there as well thanks to the slash conversion.
 2016-07-24 03:51:47 +02:00
Nikita Popov
ca64223193 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:18:51 +02:00
Nikita Popov
aecc435482 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-24 00:18:47 +02:00
Nikita Popov
04b42b1e05 More tolerance in another IntlCalendar test 
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
 2016-07-24 00:15:14 +02:00
Nikita Popov
42e995e0d3 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-24 00:08:18 +02:00
Nikita Popov
2194690625 Ensure session GC is not run during variation6.phpt 
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
 2016-07-24 00:07:54 +02:00
Anatol Belski
69ae61af96 add folds 2016-07-23 23:24:32 +02:00
Anatol Belski
88d4f149a6 improve typedef and fix the fake function 2016-07-23 23:24:32 +02:00
Anatol Belski
40557fdc34 add missing cast 2016-07-23 23:24:32 +02:00
Sjon Hortensius
66626cc223 Fix typos, previous version used reserver/reserverd/reserved 2016-07-23 23:14:14 +02:00
Anatol Belski
0f16c56262 Fixed bug #72625 realpath() fails on non canonical long path 2016-07-23 21:11:27 +02:00
Anatol Belski
fc30b8e0f7 correct comment 2016-07-23 21:11:27 +02:00
Anatol Belski
7d83324105 don't return long path prefix to script 2016-07-23 21:11:27 +02:00
Anatol Belski
3d95cc50a7 fix test 2016-07-23 21:06:11 +02:00
Anatol Belski
b238211732 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2016-07-23 21:04:52 +02:00
Anatol Belski
958fa34c16 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix test
 2016-07-23 21:03:45 +02:00
Anatol Belski
80fee637f4 fix test 2016-07-23 20:55:39 +02:00
Christoph M. Becker
8aa9ddb4d2 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 19:38:45 +02:00
Christoph M. Becker
2c0a18480d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 19:36:53 +02:00
Christoph M. Becker
88838dd282 Fix #68712: suspicious if-else statements 2016-07-23 19:29:43 +02:00
Christoph M. Becker
88bc54d3dc Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 18:13:29 +02:00
Christoph M. Becker
03ccd42b18 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 18:12:14 +02:00
Christoph M. Becker
9fbd0c1ff1 Fix copy&paste errors in gd_interpolation.c 
According to <https://github.com/libgd/libgd/commit/f101380>.
 2016-07-23 18:09:18 +02:00
Christoph M. Becker
03eeea4aa5 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 16:57:12 +02:00
Christoph M. Becker
5056d59f96 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-23 16:55:16 +02:00
Christoph M. Becker
2c16b9cf62 Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c 
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.

[1] <https://github.com/libgd/libgd/commit/aa1d71c>
 2016-07-23 16:48:07 +02:00
Bob Weinand
35764e3579 Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1 2016-07-23 16:40:02 +02:00
Bob Weinand
6046acf93e Fix ClosedGeneratorException possibly thrown into wrong scope 2016-07-23 16:39:21 +02:00
Nikita Popov
696d6e7c90 Merge branch 'PHP-7.0' into PHP-7.1 2016-07-23 13:30:55 +02:00
Nikita Popov
f12fd5c2d3 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-07-23 13:29:57 +02:00
vhuk
65abdb556d Fix for bug #54431 2016-07-23 13:28:42 +02:00
Nikita Popov
f4d1af7981 Fix build 
Missed this occurrence...
 2016-07-23 00:12:11 +02:00
Nikita Popov
07af6ba898 Make sure TOKEN_PARSE mode is thread safe 
Introduce an on_event_context passed to the on_event hook. Use this
context to pass along the token array. Previously this was stored
in a non-tls global :/
 2016-07-23 00:00:13 +02:00