clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,989 Commits 493 Branches 1,366 Tags 848 MiB
94b66b8793
Commit Graph

97989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
94b66b8793 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-04 16:47:55 +02:00
Christoph M. Becker
7f97d63130 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-04 16:39:45 +02:00
Christoph M. Becker
b7259b71b4 Fix #72994: mbc_to_code() out of bounds read 
We're backporting commit 999a3553 to the still supported PHP 5.6.
 2016-09-04 16:37:06 +02:00
Nikita Popov
69f0d3df60 Bump PHP_API_VERSION 2016-09-04 14:27:28 +02:00
Nikita Popov
f1bfd7fe00 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 23:31:05 +02:00
Nikita Popov
1ae2d074f8 Fix bug #72996 2016-09-03 23:30:23 +02:00
Christoph M. Becker
85824eda36 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 20:09:50 +02:00
Christoph M. Becker
8cc9570f53 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 19:59:44 +02:00
Christoph M. Becker
d582241368 Fix #67325: imagetruecolortopalette: white is duplicated in palette 
gdImageTrueColorToPalette() is sometimes wasteful by putting multiple white
color entries into the palette. This is caused by an obvious typo, where
to avoid a division by zero when `total` is zero, `count` is checked instead
of `total`.

We fix this issue to improve the quality of the color quantization.

Cf. <https://github.com/libgd/libgd/commit/24b4550f>
 2016-09-03 19:50:42 +02:00
Anatol Belski
1b2a06fe64 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix leak and error check order
 2016-09-03 17:04:43 +02:00
Anatol Belski
c9040d43a8 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix leak and error check order
 2016-09-03 17:03:55 +02:00
Anatol Belski
9513187dee fix leak and error check order 2016-09-03 16:59:17 +02:00
Christoph M. Becker
9eeb705eca Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 13:53:07 +02:00
Christoph M. Becker
0bc7e0c0ce Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 13:46:03 +02:00
Christoph M. Becker
bca913d70a Fix proto comment 
While we're at it, we also change a related comment to use American English
consistently.
 2016-09-03 13:41:29 +02:00
Christoph M. Becker
5bdf2fa345 Merge branch 'pull-request/2114' into PHP-7.1 2016-09-03 12:00:46 +02:00
Christoph M. Becker
b8d26ebb9a Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 00:40:05 +02:00
Christoph M. Becker
f3dc00fdfb Merge branch 'PHP-5.6' into PHP-7.0 2016-09-03 00:30:05 +02:00
Christoph M. Becker
c83bdb8e6a Make test case more resilient 
When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.
 2016-09-03 00:24:30 +02:00
Anatol Belski
e89c09ba29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix double free
 2016-09-03 00:06:16 +02:00
Anatol Belski
7483acf511 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix double free
 2016-09-03 00:05:02 +02:00
Anatol Belski
5efd2a33df fix double free 2016-09-03 00:01:04 +02:00
Anatol Belski
e4564e4b98 improve fix 2016-09-02 23:33:43 +02:00
Anatol Belski
93bb779433 fix leak 2016-09-02 23:31:26 +02:00
Anatol Belski
0b5faa4461 fix leak 2016-09-02 20:20:37 +02:00
Anatol Belski
596f488e06 Add skipifs to some mb path tests 
These were invented primarily to test the multibyte path handling
patch on Windows. How it turns out by PR #2105, some test issues
on some filesystems are possible. Particularly HFS is configurable
to use different ways to save filenames, see
https://developer.apple.com/library/mac/qa/qa1173/_index.html
This makes it impossible to test the filenames byte wise, while
the results are still correct. There are still several other tests
using UTF-8 file names spread over other extensions. So far no
false positives are to see, they don't need to be touched.
 2016-09-02 19:46:32 +02:00
Anatol Belski
2c02e93e69 fix leak 2016-09-02 19:46:32 +02:00
Anatol Belski
44e43a4738 fix mem leak 2016-09-02 19:46:32 +02:00
Christoph M. Becker
8f110ee4dc Update to SQLite 3.14.1 2016-09-02 17:58:16 +02:00
Stephan Muggli
9c69d98614 Fix typo in UPGRADING 2016-09-02 15:04:58 +00:00
Julien Pauli
e681b8771b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix warning about sign-mismatch comparisons
 2016-09-02 17:02:25 +02:00
Julien Pauli
e14b14d026 Fix warning about sign-mismatch comparisons 2016-09-02 17:01:52 +02:00
Stanislav Malyshev
01f4a52aaa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:29:17 -07:00
Stanislav Malyshev
2adc335eb5 Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:php-src: (134 commits)
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
  Revert 	39587c4817 	8b7f594a2b Because of 	24fdffdacb
  add extra test to protected behavior of compact and array string key order
  fix unintentional bc break with compact('this') behavior
  Fix some grammatical errors in PHP 7.1 Upgrade Notes
  Update NEWS
  Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
  Update NEWS and UPGRADING
  Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc""
  Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id""
  Revert "Revert "Add tests""
  Revert "Fix NEWS"
  Fix bug #72940 properly. Reduce needless branches
  ...
 2016-09-01 23:28:56 -07:00
Stanislav Malyshev
ccc8d92d3d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72910
  5.6.27 will be next
 2016-09-01 23:28:44 -07:00
Stanislav Malyshev
e576714f6b Fix bug #72910 
Merge upstream patch from 65bdf2a0d1
 2016-09-01 23:27:06 -07:00
Anatol Belski
f1cf26ea4f fix useless assignment 2016-09-01 23:45:31 +02:00
Anatol Belski
1d64b4c71e avoid needless function call 2016-09-01 23:45:31 +02:00
Anatol Belski
a989091880 remove useless assignment 2016-09-01 23:45:31 +02:00
Anatol Belski
0382a64fdf remove unused assignment 2016-09-01 23:45:31 +02:00
Anatol Belski
ac82a34185 rewrite the getcwd part 
Also fixes a possible memory leak. Still not ideal, as seems CWD
longer than MAX_PATH is still not supported. But a heap allocation
is not needed anyway, as MAXPATHLEN value is the maximum supported.
 2016-09-01 23:45:31 +02:00
Anatol Belski
7020e6f9ae fix leak 2016-09-01 23:45:31 +02:00
Anatol Belski
0a50cbabf6 fix unused assignment 2016-09-01 23:45:31 +02:00
Anatol Belski
cd7853b455 remove duplicated symbol 2016-09-01 23:45:31 +02:00
Ferenc Kovacs
fbb81dd755 5.6.27 will be next 2016-09-01 20:27:19 +02:00
Remi Collet
5a9691bf08 Revert 
39587c4817
	8b7f594a2b
Because of
	24fdffdacb
 2016-09-01 15:21:45 +02:00
Márcio Almada
cba560e67f add extra test to protected behavior of compact and array string key order 2016-09-01 13:01:42 +02:00
Márcio Almada
00c2c3a476 fix unintentional bc break with compact('this') behavior 2016-09-01 13:01:38 +02:00
Teoh Han Hui
2c3408f5cb Fix some grammatical errors in PHP 7.1 Upgrade Notes 
[skip ci]
 2016-09-01 12:58:32 +02:00
Xinchen Hui
06e4a03e01 Update NEWS 2016-09-01 12:11:24 +08:00