Xinchen Hui [Mon, 24 Jun 2013 15:49:30 +0000 (23:49 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_API.c
Xinchen Hui [Mon, 24 Jun 2013 15:45:08 +0000 (23:45 +0800)]
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
David Soria Parra [Mon, 24 Jun 2013 13:38:48 +0000 (15:38 +0200)]
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.
Remi Collet [Mon, 24 Jun 2013 09:15:50 +0000 (11:15 +0200)]
fix imagecreatefromwebp and imagewebp protos
Remi Collet [Mon, 24 Jun 2013 09:10:52 +0000 (11:10 +0200)]
Use same logic to load WebP image that other formats
Remi Collet [Mon, 24 Jun 2013 09:03:12 +0000 (11:03 +0200)]
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
Dmitry Stogov [Mon, 24 Jun 2013 07:59:50 +0000 (11:59 +0400)]
OPcache must be compatible with LiteSpeed SAPI
Stanislav Malyshev [Mon, 24 Jun 2013 06:37:10 +0000 (23:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
seems to be working fine for me on 32-bit
Stanislav Malyshev [Mon, 24 Jun 2013 06:36:43 +0000 (23:36 -0700)]
seems to be working fine for me on 32-bit
Stanislav Malyshev [Mon, 24 Jun 2013 04:26:43 +0000 (21:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62759: Buggy grapheme_substr() on edge case
Stanislav Malyshev [Mon, 24 Jun 2013 04:25:12 +0000 (21:25 -0700)]
Fix bug #62759: Buggy grapheme_substr() on edge case
Jakub Vrana [Wed, 15 May 2013 19:40:49 +0000 (12:40 -0700)]
Require second parameter of imagecrop()
Stanislav Malyshev [Sun, 23 Jun 2013 22:21:45 +0000 (15:21 -0700)]
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
Damjan Cvetko [Mon, 10 Jun 2013 10:11:14 +0000 (12:11 +0200)]
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Stanislav Malyshev [Sun, 23 Jun 2013 20:54:50 +0000 (13:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Adding test to verify that __sleep can handle parent classes' private members
Adding test to stabelize keys used when converting objects to arrays
Marco Pivetta [Thu, 20 Jun 2013 08:34:45 +0000 (10:34 +0200)]
Adding test to verify that __sleep can handle parent classes' private members
Marco Pivetta [Thu, 20 Jun 2013 08:17:32 +0000 (10:17 +0200)]
Adding test to stabelize keys used when converting objects to arrays
Adam Harvey [Sun, 23 Jun 2013 18:04:10 +0000 (11:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65088 (Generated configure script is malformed on OpenBSD).
Adam Harvey [Sun, 23 Jun 2013 18:01:36 +0000 (11:01 -0700)]
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
Remi Collet [Fri, 21 Jun 2013 12:11:04 +0000 (14:11 +0200)]
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)
Ard Biesheuvel [Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_def.h
Ard Biesheuvel [Fri, 21 Jun 2013 09:07:30 +0000 (11:07 +0200)]
Fix non-specialized executor build
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit
7628da98
Pierre Joye [Thu, 20 Jun 2013 20:22:07 +0000 (22:22 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate
Pierre Joye [Thu, 20 Jun 2013 20:19:53 +0000 (22:19 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Thu, 20 Jun 2013 20:19:33 +0000 (22:19 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate
Adam Harvey [Thu, 20 Jun 2013 16:39:37 +0000 (09:39 -0700)]
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.
Adam Harvey [Thu, 20 Jun 2013 16:34:21 +0000 (09:34 -0700)]
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.
Adam Harvey [Wed, 19 Jun 2013 18:32:37 +0000 (11:32 -0700)]
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).
Johannes Schlüter [Thu, 20 Jun 2013 09:57:10 +0000 (11:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 20 Jun 2013 09:52:29 +0000 (11:52 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 20 Jun 2013 09:51:21 +0000 (11:51 +0200)]
Update git rules (5.5 is stable, 5.3 sec only)
Remi Collet [Thu, 20 Jun 2013 06:42:30 +0000 (08:42 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
skip test for bug #64936 when tokenizer not built
Remi Collet [Thu, 20 Jun 2013 06:42:07 +0000 (08:42 +0200)]
skip test for bug #64936 when tokenizer not built
David Soria Parra [Wed, 19 Jun 2013 20:11:52 +0000 (22:11 +0200)]
Bump version
David Soria Parra [Wed, 19 Jun 2013 20:03:02 +0000 (22:03 +0200)]
Update credits
David Soria Parra [Wed, 19 Jun 2013 19:54:34 +0000 (21:54 +0200)]
Merge NEWS from PHP 5.4 branch
David Soria Parra [Wed, 19 Jun 2013 19:50:05 +0000 (21:50 +0200)]
Reorder NEWS for PHP 5.5.0 final
Pierre Joye [Wed, 19 Jun 2013 15:57:08 +0000 (17:57 +0200)]
add notes about opcache windows issue and migration from APC
Anatol Belski [Wed, 19 Jun 2013 14:24:30 +0000 (16:24 +0200)]
added some tests based on bug #64395
Johannes Schlüter [Wed, 19 Jun 2013 13:09:33 +0000 (15:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 19 Jun 2013 13:09:04 +0000 (15:09 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 19 Jun 2013 13:08:02 +0000 (15:08 +0200)]
This will be PHP 5.3.28
Remi Collet [Wed, 19 Jun 2013 10:26:53 +0000 (12:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Related to bug #65047 (Test skip on client / server version)
Remi Collet [Wed, 19 Jun 2013 10:26:21 +0000 (12:26 +0200)]
Related to bug #65047 (Test skip on client / server version)
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)
bug_49985.phpt
Make result "locale" independent
Matteo Beccati [Wed, 19 Jun 2013 09:53:05 +0000 (11:53 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #65047 (Test skip on client / server version)
Remove broken client version checking
Clean up leftover file after the test
Matteo Beccati [Wed, 19 Jun 2013 09:46:11 +0000 (11:46 +0200)]
Fixed bug #65047 (Test skip on client / server version)
Matteo Beccati [Wed, 19 Jun 2013 06:34:48 +0000 (08:34 +0200)]
Remove broken client version checking
Matteo Beccati [Wed, 19 Jun 2013 06:28:47 +0000 (08:28 +0200)]
Clean up leftover file after the test
Stanislav Malyshev [Wed, 19 Jun 2013 06:09:29 +0000 (23:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
sync NEWS
Stanislav Malyshev [Wed, 19 Jun 2013 06:06:20 +0000 (23:06 -0700)]
sync NEWS
Stanislav Malyshev [Wed, 19 Jun 2013 05:59:26 +0000 (22:59 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.18 next
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 19 Jun 2013 05:58:11 +0000 (22:58 -0700)]
5.4.18 next
Xinchen Hui [Wed, 19 Jun 2013 03:17:44 +0000 (11:17 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Wed, 19 Jun 2013 03:15:52 +0000 (11:15 +0800)]
Fix test typo
Nikita Popov [Mon, 17 Jun 2013 21:44:13 +0000 (23:44 +0200)]
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.
Stanislav Malyshev [Mon, 17 Jun 2013 08:06:28 +0000 (01:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Merge branch 'pull-request/320'
Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]
Merge branch 'pull-request/320'
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572: Clean up after the test
Fix #64572: Clean up after the test
Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]
Merge branch 'pull-request/320'
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572: Clean up after the test
Fix #64572: Clean up after the test
Stanislav Malyshev [Mon, 17 Jun 2013 07:41:46 +0000 (00:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Tests: PDO Mysql - update for fixed getColumnMeta()
fix bug #48724
Daniel Beardsley [Wed, 2 Jan 2013 17:55:23 +0000 (10:55 -0700)]
Tests: PDO Mysql - update for fixed getColumnMeta()
The test has always been disabled... so it's never run anyway. Oh well.
Antony Dovgal [Fri, 13 Apr 2012 09:59:52 +0000 (13:59 +0400)]
fix bug #48724
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
Stanislav Malyshev [Mon, 17 Jun 2013 07:15:59 +0000 (00:15 -0700)]
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
Stanislav Malyshev [Mon, 17 Jun 2013 07:15:31 +0000 (00:15 -0700)]
readline can output control codes
Hartmel [Tue, 28 May 2013 07:59:43 +0000 (09:59 +0200)]
Bug #55694: Update readline test to support attempted_completion_over variable
Hartmel [Mon, 27 May 2013 15:49:06 +0000 (17:49 +0200)]
Bug #55694: Expose attempted_completion_over variable from readline library
Xinchen Hui [Mon, 17 Jun 2013 05:23:24 +0000 (13:23 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 17 Jun 2013 05:22:20 +0000 (13:22 +0800)]
Fix typo in test
Stanislav Malyshev [Mon, 17 Jun 2013 01:14:16 +0000 (18:14 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Identation Fixed
Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]
Identation Fixed
Stanislav Malyshev [Mon, 17 Jun 2013 01:13:26 +0000 (18:13 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Identation Fixed
Jefersson Nathan [Mon, 1 Apr 2013 20:17:41 +0000 (17:17 -0300)]
Identation Fixed
Stanislav Malyshev [Sun, 16 Jun 2013 23:55:18 +0000 (16:55 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64764: Add status option to fpm init.d script
Lior Kaplan [Thu, 16 May 2013 16:46:53 +0000 (19:46 +0300)]
Fix bug #64764: Add status option to fpm init.d script
Stanislav Malyshev [Sun, 16 Jun 2013 23:41:23 +0000 (16:41 -0700)]
update NEWS
Stanislav Malyshev [Sun, 16 Jun 2013 23:40:52 +0000 (16:40 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
news for #64166
Stanislav Malyshev [Sun, 16 Jun 2013 23:40:39 +0000 (16:40 -0700)]
news for #64166
Stanislav Malyshev [Sun, 16 Jun 2013 23:38:49 +0000 (16:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add more tests for bug #64166
Move unsigned char declaration to top of block
trailing ws
Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
Stanislav Malyshev [Sun, 16 Jun 2013 23:34:34 +0000 (16:34 -0700)]
add more tests for bug #64166
Michael M Slusarz [Mon, 18 Mar 2013 18:03:11 +0000 (12:03 -0600)]
Move unsigned char declaration to top of block
Michael M Slusarz [Mon, 18 Mar 2013 18:02:54 +0000 (12:02 -0600)]
trailing ws
Michael M Slusarz [Mon, 25 Feb 2013 01:34:35 +0000 (18:34 -0700)]
Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
Second attempt: need to use lookaheadto determine whether to encode ws
Michael M Slusarz [Thu, 7 Feb 2013 19:37:52 +0000 (12:37 -0700)]
Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
Stanislav Malyshev [Sun, 16 Jun 2013 22:29:25 +0000 (15:29 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
Stanislav Malyshev [Sun, 16 Jun 2013 22:02:51 +0000 (15:02 -0700)]
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
Stanislav Malyshev [Sun, 16 Jun 2013 21:08:58 +0000 (14:08 -0700)]
ws fix
Anatol Belski [Sun, 16 Jun 2013 22:10:32 +0000 (00:10 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test
Anatol Belski [Sun, 16 Jun 2013 22:09:05 +0000 (00:09 +0200)]
Xinchen Hui [Sun, 16 Jun 2013 14:56:47 +0000 (22:56 +0800)]
Update NEWS
Xinchen Hui [Sun, 16 Jun 2013 14:56:22 +0000 (22:56 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 16 Jun 2013 14:55:59 +0000 (22:55 +0800)]
Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
Boris Lytochkin [Sat, 15 Jun 2013 20:09:55 +0000 (00:09 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix typo in test
Boris Lytochkin [Sat, 15 Jun 2013 20:09:18 +0000 (00:09 +0400)]
fix typo in test
Boris Lytochkin [Sat, 15 Jun 2013 20:04:00 +0000 (00:04 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
Boris Lytochkin [Sat, 15 Jun 2013 20:03:30 +0000 (00:03 +0400)]
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fix double entry
Merge branch 'pull-request/341'
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Fixed test script
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Callback has to be restored in MSHUTDOWN
Update NEWs
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed merge wrongly
...
Matteo Beccati [Fri, 14 Jun 2013 14:55:12 +0000 (16:55 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #63186 (compile failure on netbsd)
Matteo Beccati [Fri, 14 Jun 2013 14:54:32 +0000 (16:54 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)
Matteo Beccati [Fri, 14 Jun 2013 14:51:54 +0000 (16:51 +0200)]
Fixed bug #63186 (compile failure on netbsd)
Stanislav Malyshev [Thu, 13 Jun 2013 17:30:18 +0000 (10:30 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix test for bug #60322
Stanislav Malyshev [Thu, 13 Jun 2013 17:23:23 +0000 (10:23 -0700)]
fix test for bug #60322
Anatol Belski [Wed, 12 Jun 2013 11:15:18 +0000 (13:15 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
ensure the error_reporting level to get expected notice