]>
granicus.if.org Git - php/log
Joe Watkins [Tue, 12 Sep 2017 06:06:11 +0000 (07:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
jhdxr [Sun, 10 Sep 2017 18:11:58 +0000 (02:11 +0800)]
fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
Xinchen Hui [Tue, 12 Sep 2017 05:27:40 +0000 (13:27 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fixed bug #46781 (BC math handles minus zero incorrectly)
Fork test to keep up with libxsl >= 1.1.30
Add symbol to libxml exports
Fix test compat with libxml2 2.9.5
Fix test compat with libxml2 2.9.5
Fix test portability
Fix test compatibility with libxml2 2.9.5
Xinchen Hui [Tue, 12 Sep 2017 05:26:07 +0000 (13:26 +0800)]
Fixed arginfo for get_defined_functions
Christoph M. Becker [Mon, 11 Sep 2017 21:45:24 +0000 (23:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #46781 (BC math handles minus zero incorrectly)
Christoph M. Becker [Mon, 11 Sep 2017 21:44:23 +0000 (23:44 +0200)]
Fixed bug #46781 (BC math handles minus zero incorrectly)
Actually, there is no negative zero at all. We obey Postel's law, and
still accept negative zeroes, but we store them as positive zeroes
after the conversion from string, i.e. we normalize before further
processing.
Anatol Belski [Mon, 11 Sep 2017 16:20:13 +0000 (18:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fork test to keep up with libxsl >= 1.1.30
Anatol Belski [Mon, 11 Sep 2017 16:14:51 +0000 (18:14 +0200)]
Fork test to keep up with libxsl >= 1.1.30
The behavior of date parsing has changed and is reflected in the
changelog. Invalid dates are not accepted, in particular dates with a
negative year, as in this test.
Anatol Belski [Mon, 11 Sep 2017 15:36:25 +0000 (17:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add symbol to libxml exports
Anatol Belski [Mon, 11 Sep 2017 15:35:25 +0000 (17:35 +0200)]
Add symbol to libxml exports
Anatol Belski [Mon, 11 Sep 2017 14:15:32 +0000 (16:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test compat with libxml2 2.9.5
Anatol Belski [Mon, 11 Sep 2017 14:12:04 +0000 (16:12 +0200)]
Fix test compat with libxml2 2.9.5
One warning disappeared, but the flow is still valid.
Anatol Belski [Mon, 11 Sep 2017 12:35:24 +0000 (14:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test compat with libxml2 2.9.5
Anatol Belski [Mon, 11 Sep 2017 12:32:54 +0000 (14:32 +0200)]
Fix test compat with libxml2 2.9.5
From 2.9.5 on libxml explcitly initializes the keepBlanks flag.
Anatol Belski [Mon, 11 Sep 2017 10:38:20 +0000 (12:38 +0200)]
Fix test portability
The message comes from the C runtime, so it is not reliable to check the
exact wording.
Anatol Belski [Mon, 11 Sep 2017 10:18:06 +0000 (12:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test compatibility with libxml2 2.9.5
Anatol Belski [Mon, 11 Sep 2017 10:11:55 +0000 (12:11 +0200)]
Fix test compatibility with libxml2 2.9.5
Xinchen Hui [Mon, 11 Sep 2017 05:35:49 +0000 (13:35 +0800)]
Not sure why these lines are removed :<
Xinchen Hui [Mon, 11 Sep 2017 04:46:26 +0000 (12:46 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Fixed bug #73730 (textdomain(null) throws in strict mode)
Fix bug75178.phpt on Windows
Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
Add BC define for users of the typoed zend_symbtable_add_new
Fix typo in zend_symtable_add_new() API name
Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
Fixed bug #44995 (bcpowmod() fails if scale != 0)
Add missing null termination
Fixed bug #70470
Add test for bug #75155
Revert "Fixed #74977 - Appending AppendIterator leads to segfault"
Xinchen Hui [Mon, 11 Sep 2017 04:42:54 +0000 (12:42 +0800)]
Fixed bug #75152 (signed integer overflow in parse_iv)
Christoph M. Becker [Sun, 10 Sep 2017 16:40:30 +0000 (18:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73730 (textdomain(null) throws in strict mode)
Christoph M. Becker [Sun, 10 Sep 2017 16:39:29 +0000 (18:39 +0200)]
Fixed bug #73730 (textdomain(null) throws in strict mode)
The $text_domain parameter may be NULL, which we have to cater to
explicitly with regard to strict_types.
Christoph M. Becker [Sat, 9 Sep 2017 14:54:23 +0000 (16:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug75178.phpt on Windows
Christoph M. Becker [Sat, 9 Sep 2017 14:41:38 +0000 (16:41 +0200)]
Fix bug75178.phpt on Windows
bug75178.phpt fails on Windows, because the stderr output is not
interspersed with stdout output there, but rather is appended to the
end. The fix is analogous to bug72093.phpt.
Christoph M. Becker [Sat, 9 Sep 2017 11:19:48 +0000 (13:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
Christoph M. Becker [Sat, 9 Sep 2017 11:18:26 +0000 (13:18 +0200)]
Fixed bug #75178 (bcpowmod() misbehaves for non-integer base or modulus)
Since `bcpowmod()` does not support non-integral operands, we have to
truncate these in addition to emitting a respective warning. We also
have to work with the truncated values in the following.
We recognize that the division by one to enforce the truncation is
actually overkill, but we stick with it for now, and shall tackle the
issue for PHP 7.3.
Sara Golemon [Thu, 7 Sep 2017 21:36:04 +0000 (17:36 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add BC define for users of the typoed zend_symbtable_add_new
Sara Golemon [Thu, 7 Sep 2017 21:35:54 +0000 (17:35 -0400)]
Add BC define for users of the typoed zend_symbtable_add_new
Sara Golemon [Thu, 7 Sep 2017 20:26:45 +0000 (16:26 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix typo in zend_symtable_add_new() API name
Sara Golemon [Thu, 7 Sep 2017 20:05:20 +0000 (16:05 -0400)]
Fix typo in zend_symtable_add_new() API name
Christoph M. Becker [Wed, 6 Sep 2017 22:31:38 +0000 (00:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
Christoph M. Becker [Wed, 6 Sep 2017 22:30:05 +0000 (00:30 +0200)]
Fixed bug #54598 (bcpowmod() may return 1 if modulus is 1)
`x mod 1` is always zero; we have to take the scale into account,
though.
Christoph M. Becker [Wed, 6 Sep 2017 21:32:41 +0000 (23:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #44995 (bcpowmod() fails if scale != 0)
Christoph M. Becker [Wed, 6 Sep 2017 21:30:53 +0000 (23:30 +0200)]
Fixed bug #44995 (bcpowmod() fails if scale != 0)
`bc_divmod()` is supposed to do integer division, so we must not apply
a scale factor here.
Nikita Popov [Tue, 5 Sep 2017 16:14:10 +0000 (18:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 5 Sep 2017 16:13:50 +0000 (18:13 +0200)]
Add missing null termination
Nikita Popov [Tue, 5 Sep 2017 14:24:11 +0000 (16:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bouke van der Bijl [Mon, 4 Sep 2017 14:28:29 +0000 (16:28 +0200)]
Fixed bug #70470
Nikita Popov [Mon, 4 Sep 2017 19:23:07 +0000 (21:23 +0200)]
Add test for bug #75155
Nikita Popov [Mon, 4 Sep 2017 19:20:49 +0000 (21:20 +0200)]
Revert "Fixed #74977 - Appending AppendIterator leads to segfault"
This reverts commit
dbc2ffba822d13e74e37f5ba6e106f163c1008e8 .
Anatol Belski [Sat, 2 Sep 2017 14:58:44 +0000 (16:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix command
Anatol Belski [Sat, 2 Sep 2017 14:56:52 +0000 (16:56 +0200)]
Fix command
Christoph M. Becker [Fri, 1 Sep 2017 22:05:35 +0000 (00:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
Christoph M. Becker [Fri, 1 Sep 2017 22:04:02 +0000 (00:04 +0200)]
Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
We back-port https://github.com/libgd/libgd/commit/
dd48286 even though
we cannot come up with a regression test, because the erroneous
condition appears to be impossible to trigger.
We also parenthesize the inner ternary operation to avoid confusion.
Anatol Belski [Thu, 31 Aug 2017 21:57:36 +0000 (23:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Make for exclusion per regex
Anatol Belski [Thu, 31 Aug 2017 21:56:42 +0000 (23:56 +0200)]
Make for exclusion per regex
Anatol Belski [Thu, 31 Aug 2017 18:55:12 +0000 (20:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Extend ignore list for DLLs to not to look after
Anatol Belski [Thu, 31 Aug 2017 18:48:33 +0000 (20:48 +0200)]
Extend ignore list for DLLs to not to look after
fix typo
Anatol Belski [Thu, 31 Aug 2017 18:33:31 +0000 (20:33 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix `nmake install` fails when there are no shared extensions
Dylan K. Taylor [Thu, 31 Aug 2017 14:04:45 +0000 (15:04 +0100)]
Fix `nmake install` fails when there are no shared extensions
check for existence instead of muting everything
check for exe existence before trying to copy
Anatol Belski [Thu, 31 Aug 2017 17:48:11 +0000 (19:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
Dylan K. Taylor [Thu, 31 Aug 2017 14:05:13 +0000 (15:05 +0100)]
Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
Remi Collet [Thu, 31 Aug 2017 05:56:00 +0000 (07:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move AC_DEFINE in the right position (in bundled lib conditon)
Remi Collet [Thu, 31 Aug 2017 05:55:45 +0000 (07:55 +0200)]
move AC_DEFINE in the right position (in bundled lib conditon)
Anatol Belski [Mon, 28 Aug 2017 11:14:08 +0000 (13:14 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next bin SDK version for AppVeyor
Anatol Belski [Mon, 28 Aug 2017 11:12:51 +0000 (13:12 +0200)]
Move to next bin SDK version for AppVeyor
Christoph M. Becker [Sun, 27 Aug 2017 11:54:12 +0000 (13:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75124 (gdImageGrayScale() may produce colors)
Christoph M. Becker [Sun, 27 Aug 2017 11:53:39 +0000 (13:53 +0200)]
Fixed bug #75124 (gdImageGrayScale() may produce colors)
We have to make sure to avoid alpha-blending issues by explicitly
switching to `gdEffectReplace` and to restore the old value afterwards.
This is a port of <https://github.com/libgd/libgd/commit/
a7a7ece >.
Nikita Popov [Fri, 25 Aug 2017 20:02:49 +0000 (22:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Thomas Punt [Wed, 23 Aug 2017 22:35:18 +0000 (23:35 +0100)]
Fixed bug #75090
Anatol Belski [Fri, 25 Aug 2017 09:28:54 +0000 (11:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs versions
Anatol Belski [Fri, 25 Aug 2017 09:28:12 +0000 (11:28 +0200)]
update libs versions
Remi Collet [Thu, 24 Aug 2017 08:29:44 +0000 (10:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
From documentation, only the sign of returned value is relevant
Remi Collet [Thu, 24 Aug 2017 08:27:38 +0000 (10:27 +0200)]
From documentation, only the sign of returned value is relevant
With recent glibc, memcmp sometime return a negative value instead of -1
Tianfang Yang [Tue, 22 Aug 2017 05:43:07 +0000 (01:43 -0400)]
Update NEWS
Tianfang Yang [Tue, 22 Aug 2017 05:39:55 +0000 (01:39 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Tianfang Yang [Tue, 22 Aug 2017 05:10:58 +0000 (01:10 -0400)]
Merge branch 'pull-request/2534' into PHP-7.0
* pull-request/2534:
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Ingmar Runge [Mon, 22 May 2017 14:21:59 +0000 (16:21 +0200)]
Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized before PHP-FPM sets it up)
Andrea Faulds [Sat, 19 Aug 2017 19:35:22 +0000 (20:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Sat, 19 Aug 2017 19:31:54 +0000 (20:31 +0100)]
Fixed bug #75097 (gethostname fails if your host name is 64 chars long)
PHP contained two different off-by-one errors, which are fixed here. First,
it created a buffer of size HOST_NAME_MAX, not adding space for a null
terminator. Second, it subtracted 1 from the size of that buffer when passing
its size to gethostname(), despite gethostname() expecting it to be a buffer
size including space for a terminating null byte, not a string length.
Anatol Belski [Sat, 19 Aug 2017 00:41:07 +0000 (02:41 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:40:50 +0000 (02:40 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:40:17 +0000 (02:40 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 19 Aug 2017 00:01:03 +0000 (02:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix issues with phpt and EXTENSION on windows (BUG 75042)
John Boehr [Sun, 6 Aug 2017 22:04:36 +0000 (15:04 -0700)]
Fix issues with phpt and EXTENSION on windows (BUG 75042)
* Commands are not properly escaped for windows
* Specifying "-n" to check loaded modules causes "Module already loaded"
warning
* Extensions to be loaded need the "php_" prefix on Windows
Bug: https://bugs.php.net/bug.php?id=75042
Add back -n flag to fetch loaded extensions in run-tests.php
Add test for phpt EXTENSIONS directive
Add a second test for bug 75042
Add test to test loading of nonexistent shared module
with the EXTENSIONS phpt block
Pass ini settings when checking loaded extensions
Fix skipifs
Anatol Belski [Fri, 18 Aug 2017 22:31:55 +0000 (00:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix .pgd name for ts build
Anatol Belski [Fri, 18 Aug 2017 22:31:04 +0000 (00:31 +0200)]
Fix .pgd name for ts build
Remi Collet [Fri, 18 Aug 2017 12:52:30 +0000 (14:52 +0200)]
NEWS
Remi Collet [Fri, 18 Aug 2017 12:52:22 +0000 (14:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #75093 OpenSSL support not detected
Remi Collet [Fri, 18 Aug 2017 12:52:11 +0000 (14:52 +0200)]
NEWS
Remi Collet [Fri, 18 Aug 2017 12:51:44 +0000 (14:51 +0200)]
Fixed bug #75093 OpenSSL support not detected
Anatol Belski [Fri, 18 Aug 2017 10:06:07 +0000 (12:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix phpize exit status
Anatol Belski [Fri, 18 Aug 2017 09:54:56 +0000 (11:54 +0200)]
Fix phpize exit status
Configure and others are generated, not copied. Seems there's yet much
more to do wrt exit status catching.
Anatol Belski [Fri, 18 Aug 2017 09:09:59 +0000 (11:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add dump env target
Anatol Belski [Fri, 18 Aug 2017 09:08:27 +0000 (11:08 +0200)]
Add dump env target
Joe Watkins [Wed, 16 Aug 2017 15:41:48 +0000 (16:41 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Do the revert properly, and put back fraction support in 7.1
Joe Watkins [Wed, 16 Aug 2017 15:41:15 +0000 (16:41 +0100)]
bump versions
Derick Rethans [Wed, 16 Aug 2017 14:59:56 +0000 (15:59 +0100)]
Do the revert properly, and put back fraction support in 7.1
Derick Rethans [Wed, 16 Aug 2017 14:20:45 +0000 (15:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 14:19:18 +0000 (15:19 +0100)]
Revert "Upgrade timelib to 2017.05beta7"
This reverts commit
bdd56f31078bf1f34341943603cf6aaa72e0db5c .
Derick Rethans [Wed, 16 Aug 2017 14:19:11 +0000 (15:19 +0100)]
Revert "Remove removed header files from configuration files."
This reverts commit
3df753c6ca3ebc95dc0e837b2d4dc20753b5aea2 .
Derick Rethans [Wed, 16 Aug 2017 10:14:47 +0000 (11:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 10:14:41 +0000 (11:14 +0100)]
Fixed stupid test
Derick Rethans [Wed, 16 Aug 2017 08:51:28 +0000 (09:51 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Wed, 16 Aug 2017 08:51:21 +0000 (09:51 +0100)]
Added timelib version to phpinfo()
Remi Collet [Wed, 16 Aug 2017 05:46:23 +0000 (07:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
cleanup
Remi Collet [Wed, 16 Aug 2017 05:46:07 +0000 (07:46 +0200)]
cleanup
Derick Rethans [Tue, 15 Aug 2017 19:24:21 +0000 (20:24 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Tue, 15 Aug 2017 19:22:41 +0000 (20:22 +0100)]
Remove removed header files from configuration files.
Derick Rethans [Tue, 15 Aug 2017 14:06:18 +0000 (15:06 +0100)]
Merged PHP-7.0 by hand due to conflicts.