Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_API.c

Fixed bug (is_callable() triggers Fatal Error)

This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script

Fix #65108 (is_callable() triggers Fatal Error)

We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.

Use same logic to load WebP image that other formats

OPcache must be compatible with LiteSpeed SAPI

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #62759: Buggy grapheme_substr() on edge case

Fix bug #62759: Buggy grapheme_substr() on edge case

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Conflicts:
ext/sockets/sockets.c

Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).

Fix bug #65088 (Generated configure script is malformed on OpenBSD).

We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need

Fix bug #65088 (Generated configure script is malformed on OpenBSD).

We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.

[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html

show more ...

Fixed Bug #65060 imagecreatefrom... crashes with user streams
Fixed Bug #65084 imagecreatefromjpeg fails with URL

Regression introduced in 8a90aad (drop of USE_GD_IOCTX)
Secure with

Fixed Bug #65060 imagecreatefrom... crashes with user streams
Fixed Bug #65084 imagecreatefromjpeg fails with URL

Regression introduced in 8a90aad (drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)

show more ...

fix #65070, bgcolor does not use the same format as the input image with imagerotate

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctl

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Change the search in get_status_string() to correctly handle unknown codes.

show more ...

Change the search in get_status_string() to correctly handle unknown codes.

This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when

Change the search in get_status_string() to correctly handle unknown codes.

This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).

show more ...

Merge NEWS from PHP 5.4 branch

Reorder NEWS for PHP 5.5.0 final

This will be PHP 5.3.28

sync NEWS

5.4.18 next

Fix bug #65051: count() off by one inside unset()

nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right

Fix bug #65051: count() off by one inside unset()

nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.

show more ...

Update NEWS, UPGRADING and UPGRADING.INTERNALS

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724

Tests: PDO Mysql - update for fixed getColumnMeta()

The test has always been disabled... so it's never run anyway. Oh well.

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
readline can output control codes
Bug #55694: Update readline test to support attempted_completion_over variable
Bug #55694:

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
readline can output control codes
Bug #55694: Update readline test to support attempted_completion_over variable
Bug #55694: Expose attempted_completion_over variable from readline library

show more ...