]> granicus.if.org Git - php/log
php
8 years agoDon't keep dangling pointers.
Dmitry Stogov [Tue, 23 Aug 2016 09:58:46 +0000 (12:58 +0300)]
Don't keep dangling pointers.

8 years agoAdded tests and NEWS entry
Dmitry Stogov [Tue, 23 Aug 2016 09:14:31 +0000 (12:14 +0300)]
Added tests and NEWS entry
Fixed bug #72598 (Reference is lost after array_slice())

8 years agoRun ext/opcache/tests/*.phpt by default
Dmitry Stogov [Tue, 23 Aug 2016 08:51:08 +0000 (11:51 +0300)]
Run ext/opcache/tests/*.phpt by default

8 years agocall_user_func(_array): Don't abort on reference warning
Nikita Popov [Sat, 6 Aug 2016 13:24:23 +0000 (15:24 +0200)]
call_user_func(_array): Don't abort on reference warning

Change zend_call_function() to not abort the call if a non-reference
is passed to a reference argument. The usual warning will still be
thrown, but the call will proceed as usual.

8 years agoFixed tests
Xinchen Hui [Tue, 23 Aug 2016 03:32:21 +0000 (11:32 +0800)]
Fixed tests

8 years agoFixed bug #72920 (Accessing a private constant using constant() creates an exception...
Xinchen Hui [Mon, 22 Aug 2016 15:44:38 +0000 (23:44 +0800)]
Fixed bug #72920 (Accessing a private constant using constant() creates an exception AND warning)

8 years agoFixed CFG construction for stackless execution (split basic blocks after calls)
Dmitry Stogov [Mon, 22 Aug 2016 13:48:26 +0000 (16:48 +0300)]
Fixed CFG construction for stackless execution (split basic blocks after calls)

8 years agoAdjust test so that it passes on more restrictive filesystems
Yasuo Ohgaki [Mon, 22 Aug 2016 08:01:07 +0000 (17:01 +0900)]
Adjust test so that it passes on more restrictive filesystems

8 years agoDo not expect error 0407006A in openssl_private_(en|de)crypt
Jakub Zelenka [Sun, 21 Aug 2016 19:29:03 +0000 (20:29 +0100)]
Do not expect error 0407006A in openssl_private_(en|de)crypt

It makes the test work with OpenSSL 1.1

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 21 Aug 2016 17:49:57 +0000 (19:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 21 Aug 2016 17:43:17 +0000 (19:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #68716: possible resource leaks in _php_image_convert()
Christoph M. Becker [Sun, 21 Aug 2016 17:39:58 +0000 (19:39 +0200)]
Fix #68716: possible resource leaks in _php_image_convert()

We properly clean up after ourselves wrt. to closing opened file pointers
and created images.

8 years agoextend readdir utf-8 name test
Anatol Belski [Sun, 21 Aug 2016 16:21:07 +0000 (18:21 +0200)]
extend readdir utf-8 name test

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 21 Aug 2016 15:46:42 +0000 (17:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 21 Aug 2016 15:40:45 +0000 (17:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72913: imagecopy() loses single-color transparency on palette images
Christoph M. Becker [Sun, 21 Aug 2016 15:39:23 +0000 (17:39 +0200)]
Fix #72913: imagecopy() loses single-color transparency on palette images

The proper code to handle true-color to palette copies is already contained
in gdImageCopy(), so we can simply remove the buggy duplicated code.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 21 Aug 2016 14:16:27 +0000 (16:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sun, 21 Aug 2016 14:10:42 +0000 (16:10 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #66005: imagecopy does not support 1bit transparency on truecolor images
Christoph M. Becker [Sun, 21 Aug 2016 14:07:34 +0000 (16:07 +0200)]
Fix #66005: imagecopy does not support 1bit transparency on truecolor images

We must not copy transparent pixels, see
<https://github.com/libgd/libgd/commit/daac285c>.

8 years agoThis is unecessary for 7.1 (IS_ERROR is an internal type)
Xinchen Hui [Sun, 21 Aug 2016 09:40:10 +0000 (17:40 +0800)]
This is unecessary for 7.1 (IS_ERROR is an internal type)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sun, 21 Aug 2016 09:39:52 +0000 (17:39 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))

8 years agoFixed bug #72911 (Memleak in zend_binary_assign_op_obj_helper)
Xinchen Hui [Sun, 21 Aug 2016 09:38:03 +0000 (17:38 +0800)]
Fixed bug  #72911 (Memleak in zend_binary_assign_op_obj_helper)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Sun, 21 Aug 2016 09:19:36 +0000 (17:19 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))

8 years agoMerge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Sun, 21 Aug 2016 09:19:24 +0000 (17:19 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  Improvements to fix #72714, suggested by nikic
  Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
  Fix #72714: _xml_startElementHandler() segmentation fault
  update NEWS
  Fixed bug #72852 imap_mail null dereference
  Revert "Fix dba configuration for Windows"
  Fix dba configuration for Windows
  Fix broken test include
  fix NEWS
  Add myself as PDO_OCI maintainer

8 years agoFixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc...
Xinchen Hui [Sun, 21 Aug 2016 09:10:10 +0000 (17:10 +0800)]
Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer (zend_gc.c:260))

8 years agoDo not prepend ? on nullables in ReflectionType::__toString()
Aaron Piotrowski [Sat, 20 Aug 2016 06:06:06 +0000 (01:06 -0500)]
Do not prepend ? on nullables in ReflectionType::__toString()

Better BC with 7.0.

8 years agoRevert "Fix closure tests using ReflectionType::__toString()"
Aaron Piotrowski [Fri, 19 Aug 2016 15:05:16 +0000 (10:05 -0500)]
Revert "Fix closure tests using ReflectionType::__toString()"

This reverts commit 6fcedc96fbabc2787e18f904347f7a1429992c89.

8 years agoRevert "Append \ to class name returned from ReflectionType::__toString()"
Aaron Piotrowski [Fri, 19 Aug 2016 15:05:16 +0000 (10:05 -0500)]
Revert "Append \ to class name returned from ReflectionType::__toString()"

This reverts commit 20fdd47921f423728b409fd0ae0106dab9c34573.

8 years agofix TS issues with url rewrite globals
Anatol Belski [Sat, 20 Aug 2016 20:39:14 +0000 (22:39 +0200)]
fix TS issues with url rewrite globals

8 years agoFix off-by-one in ReflectionType::__toString()
Nikita Popov [Sat, 20 Aug 2016 17:00:03 +0000 (19:00 +0200)]
Fix off-by-one in ReflectionType::__toString()

Review mistake...

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 20 Aug 2016 10:50:48 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 20 Aug 2016 10:46:08 +0000 (12:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoImprovements to fix #72714, suggested by nikic
Christoph M. Becker [Sat, 20 Aug 2016 10:42:03 +0000 (12:42 +0200)]
Improvements to fix #72714, suggested by nikic

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 20 Aug 2016 01:09:10 +0000 (03:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 20 Aug 2016 01:02:43 +0000 (03:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
Christoph M. Becker [Fri, 19 Aug 2016 17:05:33 +0000 (19:05 +0200)]
Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence

According to the Unicode specification (at least as of 5.1), CRLF sequences
are considered to be a single grapheme. We cater to that special case by
letting grapheme_ascii_check() fail. While it would be trivial to fix
grapheme_ascii_check() wrt. grapheme_strlen(), grapheme_substr() and
grapheme_strrpos() would be much harder to handle, so we accept the slight
performance penalty if CRLF is involved.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 20 Aug 2016 00:16:39 +0000 (02:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 20 Aug 2016 00:07:28 +0000 (02:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72714: _xml_startElementHandler() segmentation fault
Christoph M. Becker [Tue, 16 Aug 2016 18:36:33 +0000 (20:36 +0200)]
Fix #72714: _xml_startElementHandler() segmentation fault

The issue is caused by an integer overflow when the `long` passed as
XML_OPTION_SKIP_TAGSTART is assigned to `xml_parser::toffset` which is
declared as `int`. We can simply work around this issue, by clipping
resulting negative values to 0 (and raising a notice in this case), because
the reasonable range for this value is certainly catered to by positive
`int`s.

However, there still remains the issue that `xml_parser::toffset` is later
added to `char *`s, which can cause OOB reads, so we make sure that the
upper bound never exceeds the strlen(). We eschew optimizing `SKIP_TAGSTART`
wrt. to the potentially duplicate strlen() call, because that code path is
unexpected anyway.

8 years agoupdate NEWS
Anatol Belski [Fri, 19 Aug 2016 23:38:56 +0000 (01:38 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 19 Aug 2016 23:38:30 +0000 (01:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS
  update NEWS
  Fixed bug #72852 imap_mail null dereference

8 years agoupdate NEWS
Anatol Belski [Fri, 19 Aug 2016 23:38:01 +0000 (01:38 +0200)]
update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 19 Aug 2016 23:37:26 +0000 (01:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Fixed bug #72852 imap_mail null dereference

8 years agoupdate NEWS
Anatol Belski [Fri, 19 Aug 2016 23:36:37 +0000 (01:36 +0200)]
update NEWS

8 years agoFixed bug #72852 imap_mail null dereference
Anatol Belski [Fri, 19 Aug 2016 23:34:46 +0000 (01:34 +0200)]
Fixed bug #72852 imap_mail null dereference

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 19 Aug 2016 14:39:56 +0000 (16:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 19 Aug 2016 14:38:53 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoRevert "Fix dba configuration for Windows"
Christoph M. Becker [Fri, 19 Aug 2016 14:35:31 +0000 (16:35 +0200)]
Revert "Fix dba configuration for Windows"

This reverts commit ad76e8a529eabf150f17d313bb035b329bc68dec.

After a discussion with Anatol it seems to be better QA wise to not make
this change in stable versions or betas.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 19 Aug 2016 10:52:13 +0000 (12:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Improve fix for bug #72837

8 years agoImprove fix for bug #72837
Anatol Belski [Fri, 19 Aug 2016 10:48:13 +0000 (12:48 +0200)]
Improve fix for bug #72837

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 19 Aug 2016 09:49:07 +0000 (11:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 19 Aug 2016 09:47:42 +0000 (11:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix dba configuration for Windows
Christoph M. Becker [Fri, 19 Aug 2016 09:42:16 +0000 (11:42 +0200)]
Fix dba configuration for Windows

To be able to build the dba extension on Windows, libdb was required. This
is contrary to *nix where each handler can be configured individually. To
avoid BC breaks, we only do minimal modifications, instead of adjusting the
Windows configuration to match the *nix configuration, for now.

8 years agoUpdate NEWS for 7.1.0RC1
Davey Shafik [Fri, 19 Aug 2016 06:51:53 +0000 (06:51 +0000)]
Update NEWS for 7.1.0RC1

8 years agoFixed bug #72888 (Segfault on clone on splFileObject)
Xinchen Hui [Fri, 19 Aug 2016 03:28:36 +0000 (11:28 +0800)]
Fixed bug #72888 (Segfault on clone on splFileObject)

8 years agoSync NEWS
Davey Shafik [Thu, 18 Aug 2016 22:51:03 +0000 (08:51 +1000)]
Sync NEWS

8 years agoDecouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
Nikita Popov [Thu, 18 Aug 2016 22:12:27 +0000 (00:12 +0200)]
Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG

Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 18 Aug 2016 16:03:15 +0000 (18:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 18 Aug 2016 15:56:16 +0000 (17:56 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix broken test include
Christoph M. Becker [Thu, 18 Aug 2016 15:53:57 +0000 (17:53 +0200)]
Fix broken test include

To avoid that the test stalls, we must always use `t` mode.

8 years agoupdate NEWS
Anatol Belski [Thu, 18 Aug 2016 15:53:08 +0000 (17:53 +0200)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 18 Aug 2016 15:51:18 +0000 (17:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Thu, 18 Aug 2016 15:50:17 +0000 (17:50 +0200)]
update NEWS

8 years agofix format
Anatol Belski [Thu, 18 Aug 2016 14:29:46 +0000 (16:29 +0200)]
fix format

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 18 Aug 2016 14:01:23 +0000 (16:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  avoid other efforts if memory mapping fails

8 years agoavoid other efforts if memory mapping fails
Anatol Belski [Thu, 18 Aug 2016 13:58:33 +0000 (15:58 +0200)]
avoid other efforts if memory mapping fails

8 years agoUpdated UPGRADING about function call args
Julien Pauli [Thu, 18 Aug 2016 13:46:00 +0000 (15:46 +0200)]
Updated UPGRADING about function call args

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 18 Aug 2016 13:36:07 +0000 (15:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test

8 years agofix test
Anatol Belski [Thu, 18 Aug 2016 13:35:26 +0000 (15:35 +0200)]
fix test

8 years agomap ell the err code
Anatol Belski [Thu, 18 Aug 2016 13:26:24 +0000 (15:26 +0200)]
map ell the err code

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 18 Aug 2016 12:40:20 +0000 (14:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72858 shm_attach null dereference

8 years agoFixed bug #72858 shm_attach null dereference
Anatol Belski [Thu, 18 Aug 2016 12:15:10 +0000 (14:15 +0200)]
Fixed bug #72858 shm_attach null dereference

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 18 Aug 2016 11:04:43 +0000 (13:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 18 Aug 2016 11:03:14 +0000 (13:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agofix NEWS
Ferenc Kovacs [Thu, 18 Aug 2016 11:01:53 +0000 (13:01 +0200)]
fix NEWS

8 years agoRemove leftover of previous change
Xinchen Hui [Thu, 18 Aug 2016 07:44:33 +0000 (15:44 +0800)]
Remove leftover of previous change

8 years agoFixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475a
Xinchen Hui [Thu, 18 Aug 2016 07:37:39 +0000 (15:37 +0800)]
Fixed segfault introduced in 447e57a1e12cdcc6791302d5097119fb2165475a

8 years agoRemove outdate checks
Xinchen Hui [Thu, 18 Aug 2016 07:37:15 +0000 (15:37 +0800)]
Remove outdate checks

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Thu, 18 Aug 2016 05:47:47 +0000 (15:47 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christopher Jones [Thu, 18 Aug 2016 05:47:36 +0000 (15:47 +1000)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoAdd myself as PDO_OCI maintainer
Christopher Jones [Thu, 18 Aug 2016 05:47:25 +0000 (15:47 +1000)]
Add myself as PDO_OCI maintainer

8 years agoPrepare for OCI8 PECL release
Christopher Jones [Thu, 18 Aug 2016 03:50:36 +0000 (13:50 +1000)]
Prepare for OCI8 PECL release

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Thu, 18 Aug 2016 03:52:56 +0000 (13:52 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoPrepare for OCI8 PECL release
Christopher Jones [Thu, 18 Aug 2016 03:52:50 +0000 (13:52 +1000)]
Prepare for OCI8 PECL release

8 years agoPrepare for OCI8 PECL release
Christopher Jones [Thu, 18 Aug 2016 03:50:36 +0000 (13:50 +1000)]
Prepare for OCI8 PECL release

8 years agofix test
Anatol Belski [Wed, 17 Aug 2016 22:18:26 +0000 (00:18 +0200)]
fix test

The improvements to the base64 functionality allows now to loosen
strictness. Strict mode still can be activated later, if there are
any issues.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 17 Aug 2016 22:16:50 +0000 (00:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync NEWS

8 years agosync NEWS
Anatol Belski [Wed, 17 Aug 2016 22:15:54 +0000 (00:15 +0200)]
sync NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 17 Aug 2016 20:13:57 +0000 (22:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 17 Aug 2016 20:12:01 +0000 (22:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoSkip tests that are supposed to fail due to bugs in old external libgd
Christoph M. Becker [Wed, 17 Aug 2016 12:04:08 +0000 (14:04 +0200)]
Skip tests that are supposed to fail due to bugs in old external libgd

8 years agoMerge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Kalle Sommer Nielsen [Wed, 17 Aug 2016 18:27:46 +0000 (20:27 +0200)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1

8 years agoFixed 7.1 build, decls first please!
Kalle Sommer Nielsen [Wed, 17 Aug 2016 18:26:32 +0000 (20:26 +0200)]
Fixed 7.1 build, decls first please!

8 years agoMake this test also a little more resilient
Christoph M. Becker [Wed, 17 Aug 2016 17:09:31 +0000 (19:09 +0200)]
Make this test also a little more resilient

See <http://git.php.net/?p=php-src.git;a=commit;h=a3159d29bb24d5c946c14b7aa33e96bebcd56e59>.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 17 Aug 2016 16:25:45 +0000 (18:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 17 Aug 2016 16:13:41 +0000 (18:13 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMake tests a little more resilient
Christoph M. Becker [Wed, 17 Aug 2016 15:59:33 +0000 (17:59 +0200)]
Make tests a little more resilient

PNG allows identical images to be stored differently what makes nearly all
tests checking the MD5 hash of the PNG representation fail with external
libgd. For now, we use the GD format instead, which doesn't allow for such
differences.

Of course, this md5() checking should be replaced by a image diffing feature
in the long run.

8 years agoSeems like I did a bad merge earlier, this should make PHP-7.0 sync with 7.1/master...
Kalle Sommer Nielsen [Wed, 17 Aug 2016 14:34:22 +0000 (16:34 +0200)]
Seems like I did a bad merge earlier, this should make PHP-7.0 sync with 7.1/master properly now

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Kalle Sommer Nielsen [Wed, 17 Aug 2016 12:15:09 +0000 (14:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444
  Fixed C89 build

8 years agoFix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444
Kalle Sommer Nielsen [Wed, 17 Aug 2016 12:10:24 +0000 (14:10 +0200)]
Fix build as done in master in commit 040331c36462eac94308bbef3200ee11389ca444

The reason why we cannot use round() here, is that it does not come with the standard C library on Windows, I don't think this affects other systems.

At the same time, also expose _php_math_round()