Bob Weinand
5ac8a2cc20
Merge branch 'PHP-7.0'
2015-12-06 14:08:17 +01:00
Joe Watkins
03a43d50e1
standard tsrm usage for seven
2015-12-06 14:06:07 +01:00
Anatol Belski
974f6c2a70
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS with fixed bug #70831
2015-12-06 12:42:25 +01:00
Anatol Belski
713ad54fec
update NEWS with fixed bug #70831
2015-12-06 12:41:51 +01:00
Anatol Belski
a2cca52aef
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix #70831 : Compile fails on system with 160 CPUs
2015-12-06 12:38:32 +01:00
Daniel Axtens
2ea924fffc
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 >
2015-12-06 12:37:08 +01:00
Joe Watkins
ee704bff78
Merge branch 'master' of https://github.com/php/php-src
2015-12-06 10:04:59 +00:00
Joe Watkins
003c91bd9b
standard tsrm usage for seven
2015-12-06 10:04:35 +00:00
Bob Weinand
6e664f60c3
Merge branch 'PHP-7.0'
2015-12-06 02:55:55 +01:00
Bob Weinand
aa8cac578e
Fix double free in formatted_print.c
2015-12-06 02:54:28 +01:00
Bob Weinand
559ede17e1
Fixed bug #71013 (Incorrect exception handler with yield from)
2015-12-06 02:45:19 +01:00
Nikita Popov
26ed778973
Merge branch 'PHP-7.0'
2015-12-05 22:48:50 +01:00
Nikita Popov
1d5744027e
Disable PEAR in Travis build
2015-12-05 22:48:29 +01:00
Sebastian Bergmann
d2f6b86c48
Fugbix typo
2015-12-05 08:25:43 +01:00
Xinchen Hui
cc2147dfaa
Merge branch 'PHP-7.0'
2015-12-04 06:51:26 -08:00
Xinchen Hui
311eb2b11e
Missed one place
2015-12-04 06:51:16 -08:00
Xinchen Hui
ee864f8030
Merge branch 'PHP-7.0'
2015-12-04 06:45:37 -08:00
Xinchen Hui
7ac24aa661
Fixed bug #71028 (Undefined index with ArrayIterator)
2015-12-04 06:45:26 -08:00
Xinchen Hui
d92c75f923
Merge branch 'PHP-7.0'
2015-12-04 11:53:48 +08:00
Xinchen Hui
3ae3341533
Fixed bug #71018 (ReflectionProperty::setValue() behavior changed)
2015-12-04 11:52:08 +08:00
Lior Kaplan
7a1ddbc267
Sort items alphabetically
2015-12-03 18:01:22 +02:00
Lior Kaplan
ca4de6c398
Align NEWS entries format
2015-12-03 17:58:59 +02:00
Lior Kaplan
5b9267c4c0
Align NEWS entries format
2015-12-03 17:53:48 +02:00
Popa Adrian Marius
75de51f262
Add PDO_Firebird fix in NEWS
2015-12-03 17:30:35 +02:00
Popa Adrian Marius
a154410597
Add PDO_Firebird fix in NEWS
2015-12-03 17:28:51 +02:00
Popa Adrian Marius
9dc6de528d
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:13:59 +02:00
Popa Adrian Marius
9ddfd49063
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:13:45 +02:00
Popa Adrian Marius
8da5752311
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:12:02 +02:00
Popa Adrian Marius
337fd3ad64
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 8907da99b8#71006 (symbol referencing errors on Sparc/Solaris)
remove PHP 5 NEWS entries
2015-12-03 16:24:24 +02:00
Popa Adrian Marius
aa90774e89
Merge branch 'master' of https://git.php.net/push/php-src
...
* 'master' of https://git.php.net/push/php-src :
NEWS for 8907da99b8#71006 (symbol referencing errors on Sparc/Solaris)
remove PHP 5 NEWS entries
remove PHP 5 NEWS entries
2015-12-03 16:16:04 +02:00
Popa Adrian Marius
c548d6b7a2
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:15:37 +02:00
Popa Adrian Marius
1745ead668
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
2015-12-03 16:15:18 +02:00
Popa Adrian Marius
4173a667fa
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:14:17 +02:00
Andrea Faulds
9012a78fa1
Merge branch 'PHP-7.0'
2015-12-03 12:16:54 +00:00
Andrea Faulds
3d6dd2a27b
NEWS for 8907da99b8
2015-12-03 12:16:15 +00:00
Dmitry Stogov
0d51ebd1a5
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
2015-12-03 13:40:53 +03:00
Dmitry Stogov
59424bb7bd
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
2015-12-03 13:28:41 +03:00
Anatol Belski
fed71a2093
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove PHP 5 NEWS entries
2015-12-03 10:56:37 +01:00
Anatol Belski
2fabcbfedb
remove PHP 5 NEWS entries
2015-12-03 10:55:58 +01:00
Anatol Belski
272b2e0e1d
Merge branch 'master' of git.php.net:php-src
2015-12-03 10:54:51 +01:00
Anatol Belski
a8cd5f6fc1
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove PHP 5 NEWS entries
2015-12-03 10:54:35 +01:00
Anatol Belski
3f818b1bd6
remove PHP 5 NEWS entries
2015-12-03 10:52:04 +01:00
Lior Kaplan
4dc996f74d
Merge branch 'PHP-7.0'
...
* PHP-7.0:
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
2015-12-02 19:34:13 +02:00
Lior Kaplan
e322fb0015
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
...
Follow up for 3689b444
2015-12-02 19:30:05 +02:00
Andrey Hristov
139af35c25
Add a method for checking if the underlying stream is valid.
2015-12-01 12:52:36 +01:00
Anatol Belski
671be5b864
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove older UPGRADING entry, bug #38409 is already fixed in 5.6
2015-12-01 11:35:00 +01:00
Anatol Belski
2f62ad16a4
remove older UPGRADING entry, bug #38409 is already fixed in 5.6
2015-12-01 11:32:52 +01:00
Adam Harvey
612b9dc12e
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).
2015-12-01 03:10:04 +00:00
Adam Harvey
91bad929aa
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.
2015-12-01 03:09:36 +00:00
Xinchen Hui
badce8c49a
Merge branch 'PHP-7.0'
2015-12-01 10:35:48 +08:00
