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
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
8da5752311
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:12:02 +02:00
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
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
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
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
4173a667fa
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:14:17 +02:00
9012a78fa1
Merge branch 'PHP-7.0'
2015-12-03 12:16:54 +00:00
3d6dd2a27b
NEWS for 8907da99b8
2015-12-03 12:16:15 +00:00
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
59424bb7bd
Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
2015-12-03 13:28:41 +03:00
fed71a2093
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove PHP 5 NEWS entries
2015-12-03 10:56:37 +01:00
2fabcbfedb
remove PHP 5 NEWS entries
2015-12-03 10:55:58 +01:00
272b2e0e1d
Merge branch 'master' of git.php.net:php-src
2015-12-03 10:54:51 +01:00
a8cd5f6fc1
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove PHP 5 NEWS entries
2015-12-03 10:54:35 +01:00
3f818b1bd6
remove PHP 5 NEWS entries
2015-12-03 10:52:04 +01:00
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
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
139af35c25
Add a method for checking if the underlying stream is valid.
2015-12-01 12:52:36 +01:00
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
2f62ad16a4
remove older UPGRADING entry, bug #38409 is already fixed in 5.6
2015-12-01 11:32:52 +01:00
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
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
badce8c49a
Merge branch 'PHP-7.0'
2015-12-01 10:35:48 +08:00
ed4b887cf6
Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)
2015-12-01 10:35:32 +08:00
00e3b7614e
Update random.c
...
Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500
2015-12-01 10:33:33 +08:00
24dd215c9a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
arrange NEWS for final and fix one NEWS mistake
2015-12-01 02:05:20 +01:00
1b27754888
arrange NEWS for final and fix one NEWS mistake
2015-12-01 02:03:49 +01:00
868c3775c6
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
2015-11-30 16:54:37 +03:00
25c5d185fc
Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed)
2015-11-30 16:52:57 +03:00
c78a782a2f
Merge branch 'PHP-7.0'
2015-11-30 10:50:34 +08:00
5df6f9f20e
Fixed bug #70993 (Array key references break argument processing)
2015-11-30 10:50:23 +08:00
4dc7354c28
Merge branch 'PHP-7.0'
2015-11-29 19:31:04 +00:00
e6e77d9e27
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.
2015-11-29 19:28:25 +00:00
681d2c946e
Merge branch 'PHP-7.0'
2015-11-28 23:48:20 -08:00
4424cbf757
Order the NEWS
2015-11-28 23:48:12 -08:00
5c707a6cf8
Merge branch 'PHP-7.0'
2015-11-28 23:44:06 -08:00
1f65006fce
Fixed bug #70931 (Two errors messages are in conflict)
2015-11-28 23:43:41 -08:00
9397f52724
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
2015-11-28 23:38:19 -08:00
cb5af748b1
Merge branch 'PHP-7.0'
2015-11-27 19:12:37 -08:00
5af61aa1cc
Space
2015-11-27 19:12:26 -08:00
58fbe7a838
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-27 07:32:21 -08:00
229351cca2
Merge branch 'master' of git.php.net:/php-src
2015-11-27 07:31:53 -08:00
f9a56e00f6
Merge branch 'PHP-7.0'
2015-11-27 07:31:19 -08:00
e9a8d7ff1d
Fixed bug #70977 , #70973 (Segmentation fault with opcache.huge_code_pages=1)
2015-11-27 07:30:37 -08:00
d120006bfd
Merge branch 'PHP-7.0'
2015-11-27 15:20:25 +00:00
8907da99b8
Set called_scope in Closure::call (fixes bug #70987 )
2015-11-27 15:06:13 +00:00
3aa2182db6
Merge branch 'PHP-7.0'
2015-11-27 15:53:19 +08:00
a347b0be48
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
2015-11-27 15:52:55 +08:00
Popa Adrian Marius