1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

93508 Commits

Author SHA1 Message Date
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
  Fixed bug #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
  Fixed bug #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
Xinchen Hui ed4b887cf6 Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type) 2015-12-01 10:35:32 +08:00
Scott 00e3b7614e Update random.c
Ref: https://github.com/jedisct1/libsodium/commit/beb826f6fd173cff4473c8b7614033dbd4803500
2015-12-01 10:33:33 +08:00
Anatol Belski 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
Anatol Belski 1b27754888 arrange NEWS for final and fix one NEWS mistake 2015-12-01 02:03:49 +01:00
Dmitry Stogov 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
Dmitry Stogov 25c5d185fc Fixed bug #70997 (When using parentClass:: instead of parent::, static context changed) 2015-11-30 16:52:57 +03:00
Xinchen Hui c78a782a2f Merge branch 'PHP-7.0' 2015-11-30 10:50:34 +08:00
Xinchen Hui 5df6f9f20e Fixed bug #70993 (Array key references break argument processing) 2015-11-30 10:50:23 +08:00
Jakub Zelenka 4dc7354c28 Merge branch 'PHP-7.0' 2015-11-29 19:31:04 +00:00
Jakub Zelenka 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
Xinchen Hui 681d2c946e Merge branch 'PHP-7.0' 2015-11-28 23:48:20 -08:00
Xinchen Hui 4424cbf757 Order the NEWS 2015-11-28 23:48:12 -08:00
Xinchen Hui 5c707a6cf8 Merge branch 'PHP-7.0' 2015-11-28 23:44:06 -08:00