Stanislav Malyshev
54f6c8d6df
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:19:26 -07:00
Adam Baratz
84d495055d
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:17:59 -07:00
David Carlier
19350b6b73
phpdbg: couple of network function return checks. Possible
...
overflow when copy the socket_path configuration.
2016-09-04 23:18:51 -07:00
Stanislav Malyshev
a2fdf0f413
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Same issue as #72926 in another place.
2016-09-04 20:57:46 -07:00
Stanislav Malyshev
b578580e88
Same issue as #72926 in another place.
2016-09-04 20:49:34 -07:00
Stanislav Malyshev
c3dfe57c23
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Sync fix for bug #72910 with current upstream
2016-09-04 19:15:30 -07:00
Stanislav Malyshev
d1fbc98ff6
Sync fix for bug #72910 with current upstream
2016-09-04 19:13:48 -07: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
1ae2d074f8
Fix bug #72996
2016-09-03 23:30:23 +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
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
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
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
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
Julien Pauli
e14b14d026
Fix warning about sign-mismatch comparisons
2016-09-02 17:01:52 +02: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
Ferenc Kovacs
fbb81dd755
5.6.27 will be next
2016-09-01 20:27:19 +02:00
Xinchen Hui
1ee41683dc
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
2016-09-01 12:10:38 +08:00
Yasuo Ohgaki
cc797d4fc3
Fix bug #72940 properly. Reduce needless branches
2016-09-01 07:47:13 +09:00
Christoph M. Becker
f93fd8ce32
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-31 16:38:38 +02:00
Christoph M. Becker
b2d267d9ee
Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory
2016-08-31 16:33:14 +02:00
Christoph M. Becker
8f32d609c5
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-31 14:53:53 +02:00
Christoph M. Becker
314a9f8553
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
...
To avoid BC breaks, we do not raise a warning for now.
2016-08-31 14:51:37 +02:00
Yasuo Ohgaki
97f2bb894a
Update NEWS
2016-08-31 21:10:57 +09:00
Yasuo Ohgaki
747b61808b
Update NEWS
2016-08-31 21:06:19 +09:00
Nikita Popov
3317287ce1
Fix bug #71711
...
Also handle another case of bug #71996 .
2016-08-30 18:06:18 +02:00
Nikita Popov
8e487aefaa
Fixed bug #71996
2016-08-30 17:20:55 +02:00
Christoph M. Becker
972302d2f0
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 15:01:12 +02:00
Christoph M. Becker
2f10db36af
Fix #66797 : mb_substr only takes 32-bit signed integer
...
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
2016-08-30 14:52:47 +02:00
Anatol Belski
52afd8b744
fix typo
2016-08-30 14:11:47 +02:00
Anatol Belski
bc7460260b
prepare for next
2016-08-30 14:11:22 +02:00
Nikita Popov
2c12a5f0a8
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 13:44:59 +02:00
Ville Hukkamäki
af7828a20f
Test case for bug #72771
2016-08-30 13:44:34 +02:00
Nikita Popov
bfd4277008
Fix bug #72957
2016-08-30 13:05:53 +02:00
Nikita Popov
6adb7e0b7a
Followup for bug #72971
...
Property writes did not respect the namespace either. This is an
incomplete fix in that it only handles the case where an existing
child element is modified, not when a new one is created.
2016-08-30 12:53:50 +02:00
Nikita Popov
07cc6a6ba2
Fix bug #72971
2016-08-30 10:54:31 +02:00
Yasuo Ohgaki
b5f2f6fbd8
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
2016-08-30 15:58:25 +09:00
Christoph M. Becker
65f0c163f9
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 02:13:48 +02:00
Christoph M. Becker
207dab585a
Fix #71882 : Negative ftruncate() on php://memory exhausts memory
...
We must not pass negative sizes to a size_t parameter.
2016-08-30 02:05:45 +02:00
Christoph M. Becker
4b45c0a9a7
Merge branch 'pull-request/2043' into PHP-7.0
2016-08-30 01:16:45 +02:00
Anatol Belski
1b227de970
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix HANDLE leak
2016-08-29 21:47:54 +02:00
Anatol Belski
c7b4cd1a51
fix HANDLE leak
2016-08-29 21:45:39 +02:00
Anatol Belski
5bcae9d586
update NEWS
2016-08-29 21:23:20 +02:00