Merge branch 'PHP-5.6' into PHP-7.0

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>.

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))

Merge branch 'PHP-7.1'

# Conflicts:
# NEWS
# UPGRADING

Do not prepend ? on nullables in ReflectionType::__toString()

Better BC with 7.0.

Merge branch 'PHP-7.0' into PHP-7.1

Merge branch 'PHP-5.6' into PHP-7.0

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

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.

show more ...

Merge branch 'PHP-7.0' into PHP-7.1

Merge branch 'PHP-5.6' into PHP-7.0

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::toffse

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.

show more ...

update NEWS

update NEWS

update NEWS

Update NEWS for 7.1.0RC1

Fixed bug #72888 (Segfault on clone on splFileObject)

Sync NEWS

update NEWS

update NEWS

fix NEWS

sync NEWS

Merge branch 'PHP-7.0' into PHP-7.1

Merge branch 'PHP-5.6' into PHP-7.0

Fix #68302: impossible to compile php with zip support

We should not let configure succeed, if SIZEOF_OFF_T == 0, just to let the
compilation fail later. Instead we bail out early, givin

Fix #68302: impossible to compile php with zip support

We should not let configure succeed, if SIZEOF_OFF_T == 0, just to let the
compilation fail later. Instead we bail out early, giving a hint regarding
the potential issue, namely misconfigured libraries.

show more ...