]>
granicus.if.org Git - php/log
Christoph M. Becker [Mon, 5 Sep 2016 09:27:46 +0000 (11:27 +0200)]
Update UPGRADING wrt. commit
c4fe264b
Julien Pauli [Mon, 5 Sep 2016 08:19:29 +0000 (10:19 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Updated NEWS
Updated NEWS
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:19:21 +0000 (10:19 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:57 +0000 (10:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updated NEWS
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:39 +0000 (10:18 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:08 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:17:56 +0000 (10:17 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:13:31 +0000 (10:13 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Mon, 5 Sep 2016 08:13:19 +0000 (10:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Mon, 5 Sep 2016 08:12:49 +0000 (10:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Thu, 1 Sep 2016 08:36:58 +0000 (10:36 +0200)]
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Stanislav Malyshev [Mon, 5 Sep 2016 07:51:01 +0000 (00:51 -0700)]
Merge branch 'pull-request/1864'
* pull-request/1864:
Tiny tweak for `$header` initialization, it should always be an array
Minor tweaks
Stanislav Malyshev [Mon, 5 Sep 2016 07:44:01 +0000 (00:44 -0700)]
Merge branch 'pull-request/2025'
* pull-request/2025:
Change the name of the second parameter of image writer functions
Stanislav Malyshev [Mon, 5 Sep 2016 07:43:52 +0000 (00:43 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Change the name of the second parameter of image writer functions
Christoph M. Becker [Sat, 23 Jul 2016 13:36:49 +0000 (15:36 +0200)]
Change the name of the second parameter of image writer functions
As of PHP 5.4.0 the second parameter of all image writer functions (except
imagexbm) accepts also a stream resource. Therefore the parameter name
`filename` is inappropriate. We change it to `to` according to what it's
already called in _php_image_output_ctx().
We consider the reflection only related BC break acceptable for a minor version.
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:57 +0000 (00:41 -0700)]
Merge branch 'pull-request/1958'
* pull-request/1958:
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:29 +0000 (00:41 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:26 +0000 (00:41 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:23 +0000 (00:41 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Added editorconfig file
Richard Fussenegger [Sun, 26 Jun 2016 15:51:44 +0000 (17:51 +0200)]
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:46 +0000 (00:39 -0700)]
Merge branch 'pull-request/2018'
* pull-request/2018:
Implement #47456: Missing PCRE option 'J'
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:06 +0000 (00:39 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Implement #47456: Missing PCRE option 'J'
Stanislav Malyshev [Mon, 5 Sep 2016 07:39:01 +0000 (00:39 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Implement #47456: Missing PCRE option 'J'
Stanislav Malyshev [Mon, 5 Sep 2016 07:38:57 +0000 (00:38 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Implement #47456: Missing PCRE option 'J'
Christoph M. Becker [Thu, 21 Jul 2016 13:36:42 +0000 (15:36 +0200)]
Implement #47456: Missing PCRE option 'J'
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).
[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php>
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:24 +0000 (00:29 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:21 +0000 (00:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:18 +0000 (00:29 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:29:11 +0000 (00:29 -0700)]
Merge branch 'pull-request/2061' into PHP-5.6
* pull-request/2061:
Recognize TDS versions 7.3 and 7.4
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:59 +0000 (00:19 -0700)]
Merge branch 'pull-request/2095'
* pull-request/2095:
Use integer placeholders, since values can vary with the TDS version
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:39 +0000 (00:19 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Use integer placeholders, since values can vary with the TDS version
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:34 +0000 (00:19 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use integer placeholders, since values can vary with the TDS version
Stanislav Malyshev [Mon, 5 Sep 2016 07:19:26 +0000 (00:19 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use integer placeholders, since values can vary with the TDS version
Adam Baratz [Wed, 24 Aug 2016 22:44:55 +0000 (18:44 -0400)]
Use integer placeholders, since values can vary with the TDS version
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:36 +0000 (23:24 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
Stanislav Malyshev [Mon, 5 Sep 2016 06:24:31 +0000 (23:24 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
David Carlier [Tue, 28 Jun 2016 06:48:58 +0000 (07:48 +0100)]
phpdbg: couple of network function return checks. Possible
overflow when copy the socket_path configuration.
Stanislav Malyshev [Mon, 5 Sep 2016 03:59:00 +0000 (20:59 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:58:09 +0000 (20:58 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:57:46 +0000 (20:57 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 03:49:34 +0000 (20:49 -0700)]
Same issue as #72926 in another place.
Stanislav Malyshev [Mon, 5 Sep 2016 02:16:05 +0000 (19:16 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Sync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:45 +0000 (19:15 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:15:30 +0000 (19:15 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Sync fix for bug #72910 with current upstream
Stanislav Malyshev [Mon, 5 Sep 2016 02:13:22 +0000 (19:13 -0700)]
Sync fix for bug #72910 with current upstream
Christoph M. Becker [Sun, 4 Sep 2016 14:53:45 +0000 (16:53 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sun, 4 Sep 2016 14:47:55 +0000 (16:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 4 Sep 2016 14:39:45 +0000 (16:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 4 Sep 2016 14:37:06 +0000 (16:37 +0200)]
Fix #72994: mbc_to_code() out of bounds read
We're backporting commit
999a3553 to the still supported PHP 5.6.
Nikita Popov [Sun, 4 Sep 2016 12:28:47 +0000 (14:28 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 4 Sep 2016 12:27:28 +0000 (14:27 +0200)]
Bump PHP_API_VERSION
Nikita Popov [Sun, 4 Sep 2016 10:43:29 +0000 (12:43 +0200)]
Drop some pieces of commented-out code
Nikita Popov [Sun, 4 Sep 2016 10:36:16 +0000 (12:36 +0200)]
Sync convert_to_null with VM cast behavior
Do not call cast_object, this is useless and we haven't been doing
it in the VM as of 7.0.
Nikita Popov [Sun, 4 Sep 2016 10:29:46 +0000 (12:29 +0200)]
Drop SXE_ELEMENT_BY_NAME
Effectively commented out code
Nikita Popov [Sun, 4 Sep 2016 10:28:00 +0000 (12:28 +0200)]
Drop unnecessary macro redefinition
Nikita Popov [Sat, 3 Sep 2016 21:31:20 +0000 (23:31 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 3 Sep 2016 21:31:05 +0000 (23:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 3 Sep 2016 21:30:23 +0000 (23:30 +0200)]
Fix bug #72996
Christoph M. Becker [Sat, 3 Sep 2016 19:33:40 +0000 (21:33 +0200)]
Remove support for ORIGINAL_LIB_JPEG
This had already been removed in GD 2.1.0, and wouldn't compile anyway.
Christoph M. Becker [Sat, 3 Sep 2016 18:11:15 +0000 (20:11 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 18:01:06 +0000 (20:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 17:52:19 +0000 (19:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 17:46:38 +0000 (19:46 +0200)]
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 >
Anatol Belski [Sat, 3 Sep 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 15:03:55 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 14:59:17 +0000 (16:59 +0200)]
fix leak and error check order
Christoph M. Becker [Sat, 3 Sep 2016 12:01:39 +0000 (14:01 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 11:53:07 +0000 (13:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 11:31:13 +0000 (13:31 +0200)]
Fix proto comment
While we're at it, we also change a related comment to use American English
consistently.
Christoph M. Becker [Sat, 3 Sep 2016 10:01:15 +0000 (12:01 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 3 Sep 2016 10:00:46 +0000 (12:00 +0200)]
Merge branch 'pull-request/2114' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:55:12 +0000 (00:55 +0200)]
Replace `dirname(__FILE__)` with `__DIR__` in tests
Christoph M. Becker [Fri, 2 Sep 2016 22:41:33 +0000 (00:41 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 22:40:05 +0000 (00:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 2 Sep 2016 22:18:19 +0000 (00:18 +0200)]
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>.
Anatol Belski [Fri, 2 Sep 2016 22:06:36 +0000 (00:06 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:06:16 +0000 (00:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:01:04 +0000 (00:01 +0200)]
fix double free
Anatol Belski [Fri, 2 Sep 2016 21:55:22 +0000 (23:55 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve fix
fix leak
fix leak
Anatol Belski [Fri, 2 Sep 2016 21:33:43 +0000 (23:33 +0200)]
improve fix
Anatol Belski [Fri, 2 Sep 2016 21:31:26 +0000 (23:31 +0200)]
fix leak
Anatol Belski [Fri, 2 Sep 2016 18:20:37 +0000 (20:20 +0200)]
fix leak
Christoph M. Becker [Fri, 2 Sep 2016 18:19:09 +0000 (20:19 +0200)]
Update UPGRADING wrt. RFC: Implement socket_getaddrinfo()
Christoph M. Becker [Fri, 2 Sep 2016 18:12:55 +0000 (20:12 +0200)]
Merge branch 'pull-request/2078'
Anatol Belski [Fri, 2 Sep 2016 17:47:08 +0000 (19:47 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add skipifs to some mb path tests
fix leak
fix mem leak
Anatol Belski [Fri, 2 Sep 2016 17:37:31 +0000 (19:37 +0200)]
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.
Anatol Belski [Fri, 2 Sep 2016 09:34:50 +0000 (11:34 +0200)]
fix leak
Anatol Belski [Fri, 2 Sep 2016 09:33:17 +0000 (11:33 +0200)]
fix mem leak
Christoph M. Becker [Fri, 2 Sep 2016 17:06:26 +0000 (19:06 +0200)]
Implement FAST_ZPP support for imagecolorat() and imagesetpixel()
These functions may be used in tight loops to do image manipulation in
userland. Using FAST_ZPP is supposed to bring considerable performance
improvements in this case; we've been able to measure up to 25%.
Christoph M. Becker [Fri, 2 Sep 2016 16:00:06 +0000 (18:00 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 15:38:44 +0000 (17:38 +0200)]
Update to SQLite 3.14.1
Julien Pauli [Fri, 2 Sep 2016 15:57:17 +0000 (17:57 +0200)]
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
This reverts commit
04115b4e3f37f24bdefb853c5c31eebd40ffff64 .
Julien Pauli [Fri, 2 Sep 2016 15:57:09 +0000 (17:57 +0200)]
Revert "PHP 7 compat"
This reverts commit
24a57ee03b5b8803a2dcffd458b8a56c13ec6293 .
Christoph M. Becker [Fri, 2 Sep 2016 15:34:11 +0000 (17:34 +0200)]
Fix typo
Stephan Muggli [Fri, 2 Sep 2016 15:04:58 +0000 (15:04 +0000)]
Fix typo in UPGRADING
Julien Pauli [Fri, 2 Sep 2016 15:02:43 +0000 (17:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix warning about sign-mismatch comparisons