granicus.if.org Git

Fix #70831: Compile fails on system with 160 CPUs

This fixes the following build issue on 160-CPU POWER8 machines

ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory
#include <zend_language_parser.h>

It is fixed by introducing an explicit dependency on the header file.

Signed-off-by: Daniel Axtens <dja@axtens.net>

commit | commitdiff | tree

Joe Watkins [Sun, 6 Dec 2015 10:04:59 +0000 (10:04 +0000)]

Merge branch 'master' of https://github.com/php/php-src

commit | commitdiff | tree

Joe Watkins [Sun, 6 Dec 2015 10:04:35 +0000 (10:04 +0000)]

standard tsrm usage for seven

commit | commitdiff | tree

Bob Weinand [Sun, 6 Dec 2015 01:55:55 +0000 (02:55 +0100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Bob Weinand [Sun, 6 Dec 2015 01:54:28 +0000 (02:54 +0100)]

Fix double free in formatted_print.c

commit | commitdiff | tree

Bob Weinand [Sun, 6 Dec 2015 01:45:19 +0000 (02:45 +0100)]

Fixed bug #71013 (Incorrect exception handler with yield from)

commit | commitdiff | tree

Nikita Popov [Sat, 5 Dec 2015 21:48:50 +0000 (22:48 +0100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Nikita Popov [Sat, 5 Dec 2015 21:48:29 +0000 (22:48 +0100)]

Disable PEAR in Travis build

commit | commitdiff | tree

Sebastian Bergmann [Sat, 5 Dec 2015 07:25:43 +0000 (08:25 +0100)]

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 14:51:26 +0000 (06:51 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 14:51:16 +0000 (06:51 -0800)]

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 14:45:37 +0000 (06:45 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 14:45:26 +0000 (06:45 -0800)]

Fixed bug #71028 (Undefined index with ArrayIterator)

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 03:53:48 +0000 (11:53 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 4 Dec 2015 03:10:07 +0000 (11:10 +0800)]

Fixed bug #71018 (ReflectionProperty::setValue() behavior changed)

commit | commitdiff | tree

Lior Kaplan [Thu, 3 Dec 2015 16:01:22 +0000 (18:01 +0200)]

Sort items alphabetically

commit | commitdiff | tree

Lior Kaplan [Thu, 3 Dec 2015 15:58:59 +0000 (17:58 +0200)]

Align NEWS entries format

commit | commitdiff | tree

Lior Kaplan [Thu, 3 Dec 2015 15:53:48 +0000 (17:53 +0200)]

Align NEWS entries format

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 15:30:35 +0000 (17:30 +0200)]

Add PDO_Firebird fix in NEWS

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 15:28:51 +0000 (17:28 +0200)]

Add PDO_Firebird fix in NEWS

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 15:13:59 +0000 (17:13 +0200)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Use LL_MASK for SQL_INT64 data formatting

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 15:13:45 +0000 (17:13 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Use LL_MASK for SQL_INT64 data formatting

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 15:12:02 +0000 (17:12 +0200)]

Use LL_MASK for SQL_INT64 data formatting

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 14:24:24 +0000 (16:24 +0200)]

Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0

* 'PHP-7.0' of https://git.php.net/push/php-src:
  NEWS for 8907da99b83204958cb2308ec12aa9e490372150
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
  remove PHP 5 NEWS entries

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 14:16:04 +0000 (16:16 +0200)]

Merge branch 'master' of https://git.php.net/push/php-src

* 'master' of https://git.php.net/push/php-src:
  NEWS for 8907da99b83204958cb2308ec12aa9e490372150
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
  remove PHP 5 NEWS entries
  remove PHP 5 NEWS entries

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 14:15:37 +0000 (16:15 +0200)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 14:15:18 +0000 (16:15 +0200)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

commit | commitdiff | tree

Popa Adrian Marius [Thu, 3 Dec 2015 14:14:17 +0000 (16:14 +0200)]

Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird

commit | commitdiff | tree

Andrea Faulds [Thu, 3 Dec 2015 12:16:54 +0000 (12:16 +0000)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Andrea Faulds [Thu, 3 Dec 2015 12:16:15 +0000 (12:16 +0000)]

NEWS for 8907da99b83204958cb2308ec12aa9e490372150

commit | commitdiff | tree

Dmitry Stogov [Thu, 3 Dec 2015 10:40:53 +0000 (13:40 +0300)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)

commit | commitdiff | tree

Dmitry Stogov [Thu, 3 Dec 2015 10:28:41 +0000 (13:28 +0300)]

Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)

commit | commitdiff | tree

Anatol Belski [Thu, 3 Dec 2015 09:56:37 +0000 (10:56 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
remove PHP 5 NEWS entries

commit | commitdiff | tree

Anatol Belski [Thu, 3 Dec 2015 09:52:04 +0000 (10:52 +0100)]

remove PHP 5 NEWS entries

commit | commitdiff | tree

Anatol Belski [Thu, 3 Dec 2015 09:54:51 +0000 (10:54 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Anatol Belski [Thu, 3 Dec 2015 09:54:35 +0000 (10:54 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
remove PHP 5 NEWS entries

commit | commitdiff | tree

Anatol Belski [Thu, 3 Dec 2015 09:52:04 +0000 (10:52 +0100)]

remove PHP 5 NEWS entries

commit | commitdiff | tree

Lior Kaplan [Wed, 2 Dec 2015 17:34:13 +0000 (19:34 +0200)]

Merge branch 'PHP-7.0'

* PHP-7.0:
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG

commit | commitdiff | tree

Lior Kaplan [Mon, 23 Nov 2015 17:08:46 +0000 (19:08 +0200)]

SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG

Follow up for 3689b444

commit | commitdiff | tree

Andrey Hristov [Tue, 1 Dec 2015 11:52:36 +0000 (12:52 +0100)]

Add a method for checking if the underlying stream is valid.

commit | commitdiff | tree

Anatol Belski [Tue, 1 Dec 2015 10:35:00 +0000 (11:35 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
remove older UPGRADING entry, bug #38409 is already fixed in 5.6

commit | commitdiff | tree

Anatol Belski [Tue, 1 Dec 2015 10:32:52 +0000 (11:32 +0100)]

remove older UPGRADING entry, bug #38409 is already fixed in 5.6

commit | commitdiff | tree

Adam Harvey [Tue, 1 Dec 2015 03:10:04 +0000 (03:10 +0000)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).

commit | commitdiff | tree

Adam Harvey [Tue, 1 Dec 2015 03:09:36 +0000 (03:09 +0000)]

Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).

We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.

commit | commitdiff | tree

Xinchen Hui [Tue, 1 Dec 2015 02:35:48 +0000 (10:35 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Tue, 1 Dec 2015 02:35:32 +0000 (10:35 +0800)]

Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)

commit | commitdiff | tree

Scott [Wed, 14 Oct 2015 19:16:59 +0000 (15:16 -0400)]

Update random.c

Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500

commit | commitdiff | tree

Anatol Belski [Tue, 1 Dec 2015 01:05:20 +0000 (02:05 +0100)]

Merge branch 'PHP-7.0'

* PHP-7.0:
arrange NEWS for final and fix one NEWS mistake

commit | commitdiff | tree

Anatol Belski [Tue, 1 Dec 2015 00:58:01 +0000 (01:58 +0100)]

arrange NEWS for final and fix one NEWS mistake

commit | commitdiff | tree

Dmitry Stogov [Mon, 30 Nov 2015 13:54:37 +0000 (16:54 +0300)]

Merge branch 'PHP-7.0'

* PHP-7.0:
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)

commit | commitdiff | tree

Dmitry Stogov [Mon, 30 Nov 2015 13:52:57 +0000 (16:52 +0300)]

Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)

commit | commitdiff | tree

Xinchen Hui [Mon, 30 Nov 2015 02:50:34 +0000 (10:50 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Mon, 30 Nov 2015 02:50:23 +0000 (10:50 +0800)]

Fixed bug #70993 (Array key references break argument processing)

commit | commitdiff | tree

Jakub Zelenka [Sun, 29 Nov 2015 19:31:04 +0000 (19:31 +0000)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Jakub Zelenka [Sun, 29 Nov 2015 19:28:25 +0000 (19:28 +0000)]

Fix typo in php_stream_from_res_no_verify

This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.

commit | commitdiff | tree

Xinchen Hui [Sun, 29 Nov 2015 07:48:20 +0000 (23:48 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Sun, 29 Nov 2015 07:48:12 +0000 (23:48 -0800)]

commit | commitdiff | tree

Xinchen Hui [Sun, 29 Nov 2015 07:44:06 +0000 (23:44 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Sun, 29 Nov 2015 07:43:41 +0000 (23:43 -0800)]

Fixed bug #70931 (Two errors messages are in conflict)

commit | commitdiff | tree

Xinchen Hui [Sun, 29 Nov 2015 07:38:19 +0000 (23:38 -0800)]

Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)

commit | commitdiff | tree

Xinchen Hui [Sat, 28 Nov 2015 03:12:37 +0000 (19:12 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Sat, 28 Nov 2015 03:12:26 +0000 (19:12 -0800)]

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 15:32:21 +0000 (07:32 -0800)]

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 15:31:53 +0000 (07:31 -0800)]

Merge branch 'master' of git.php.net:/php-src

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 15:31:19 +0000 (07:31 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 15:30:37 +0000 (07:30 -0800)]

Fixed bug #70977, #70973 (Segmentation fault with opcache.huge_code_pages=1)

commit | commitdiff | tree

Andrea Faulds [Fri, 27 Nov 2015 15:20:25 +0000 (15:20 +0000)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Andrea Faulds [Fri, 27 Nov 2015 15:06:13 +0000 (15:06 +0000)]

Set called_scope in Closure::call (fixes bug #70987)

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 07:53:19 +0000 (15:53 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 07:52:55 +0000 (15:52 +0800)]

Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 03:42:39 +0000 (11:42 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 03:42:30 +0000 (11:42 +0800)]

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 03:33:05 +0000 (11:33 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Fri, 27 Nov 2015 03:32:38 +0000 (11:32 +0800)]

Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)

commit | commitdiff | tree

Nikita Popov [Thu, 26 Nov 2015 15:57:11 +0000 (16:57 +0100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Nikita Popov [Thu, 26 Nov 2015 15:56:08 +0000 (16:56 +0100)]

Forbid namespace\int type hint as well

commit | commitdiff | tree

Dmitry Stogov [Thu, 26 Nov 2015 08:27:24 +0000 (11:27 +0300)]

Fixed compilation warning

commit | commitdiff | tree

Xinchen Hui [Thu, 26 Nov 2015 04:00:37 +0000 (12:00 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Thu, 26 Nov 2015 04:00:25 +0000 (12:00 +0800)]

commit | commitdiff | tree

Bob Weinand [Wed, 25 Nov 2015 22:10:06 +0000 (23:10 +0100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Bob Weinand [Wed, 25 Nov 2015 22:09:44 +0000 (23:09 +0100)]

Fixed bug causing exception not being thrown immediately into a generator yielding from an array

commit | commitdiff | tree

Christopher Jones [Wed, 25 Nov 2015 19:53:54 +0000 (06:53 +1100)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Christopher Jones [Wed, 25 Nov 2015 19:51:46 +0000 (06:51 +1100)]

Change line endings: Windows to Unix

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 16:04:59 +0000 (08:04 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 16:04:36 +0000 (08:04 -0800)]

Fixed NEWs again (not sure why this is messd up twice today)

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 16:00:50 +0000 (08:00 -0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 15:57:01 +0000 (07:57 -0800)]

Fixed bug #70970 (Segfault when combining error handler with output buffering)

of course we can try to refactor the current flow to make this error can
be catched safly.

but as 7.0.0 is releasing, I don't think a refactor is safe now. and
actually I don't see any gain to make this catchable.

so let's keep this be consistent with 5.6 and safe for now

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 14:34:40 +0000 (06:34 -0800)]

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 12:20:51 +0000 (20:20 +0800)]

Merge branch 'PHP-7.0'

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 12:20:05 +0000 (20:20 +0800)]

ZEND_SPACESHIP supports

commit | commitdiff | tree

Xinchen Hui [Wed, 25 Nov 2015 11:15:41 +0000 (19:15 +0800)]

Merge branch 'PHP-7.0'