]>
granicus.if.org Git - php/log
Xinchen Hui [Tue, 9 Jan 2018 08:21:13 +0000 (16:21 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75781 (substr_count incorrect result)
Xinchen Hui [Tue, 9 Jan 2018 08:20:19 +0000 (16:20 +0800)]
Fixed bug #75781 (substr_count incorrect result)
Dmitry Stogov [Tue, 9 Jan 2018 07:30:00 +0000 (10:30 +0300)]
Fixed possible incorrect "mark" usage
Anatol Belski [Thu, 4 Jan 2018 15:09:51 +0000 (16:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tests
Anatol Belski [Thu, 4 Jan 2018 15:08:41 +0000 (16:08 +0100)]
Fix tests
Lior Kaplan [Wed, 3 Jan 2018 22:48:45 +0000 (00:48 +0200)]
Happy new year (Update copyright to 2018)
Anatol Belski [Wed, 3 Jan 2018 17:36:10 +0000 (18:36 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip on Travis-CI
Anatol Belski [Wed, 3 Jan 2018 17:32:33 +0000 (18:32 +0100)]
Skip on Travis-CI
The current doc states max ram for a test VM would be 7.5G, the
currently used container image has even less. This skip should be
revisited, as the available memory amount shifts. The way of checking
/proc/meminfo doesn't work reliably on containers at least, thus
skipping explicitly on Travis-CI makes sense.
Anatol Belski [Wed, 3 Jan 2018 15:56:00 +0000 (16:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Extend skip section
Anatol Belski [Wed, 3 Jan 2018 15:54:14 +0000 (16:54 +0100)]
Extend skip section
The test requires some untrivial amount of RAM. Added a simple check for
the system free RAM to avoid false positive fails.
Remi Collet [Wed, 3 Jan 2018 14:13:10 +0000 (15:13 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
2018
Remi Collet [Wed, 3 Jan 2018 14:13:03 +0000 (15:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
2018
Remi Collet [Wed, 3 Jan 2018 14:12:56 +0000 (15:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
2018
Remi Collet [Wed, 3 Jan 2018 14:12:39 +0000 (15:12 +0100)]
2018
Remi Collet [Wed, 3 Jan 2018 14:10:09 +0000 (15:10 +0100)]
missing changelog entries + fix version and date
Remi Collet [Wed, 3 Jan 2018 14:07:36 +0000 (15:07 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
missing changelog entries
2018
Remi Collet [Wed, 3 Jan 2018 14:07:18 +0000 (15:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
2018
Remi Collet [Wed, 3 Jan 2018 14:07:09 +0000 (15:07 +0100)]
missing changelog entries
Remi Collet [Wed, 3 Jan 2018 14:04:48 +0000 (15:04 +0100)]
2018
Xinchen Hui [Wed, 3 Jan 2018 08:00:34 +0000 (16:00 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Happy new year (Update copyright to 2018)
Xinchen Hui [Wed, 3 Jan 2018 07:59:05 +0000 (15:59 +0800)]
Merge branch 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src into PHP-7.1
* 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src:
Happy new year (Update copyright to 2018)
Ferenc Kovacs [Tue, 2 Jan 2018 23:35:50 +0000 (00:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 2 Jan 2018 23:34:24 +0000 (00:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 2 Jan 2018 23:33:20 +0000 (00:33 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 2 Jan 2018 23:30:58 +0000 (00:30 +0100)]
php 5.6.34 is next
Lior Kaplan [Tue, 2 Jan 2018 21:42:29 +0000 (23:42 +0200)]
Happy new year (Update copyright to 2018)
Anatol Belski [Tue, 2 Jan 2018 11:29:19 +0000 (12:29 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip test for pdo_odbc
Anatol Belski [Tue, 2 Jan 2018 11:12:46 +0000 (12:12 +0100)]
Skip test for pdo_odbc
The error messages are too discrepant and '-' is otherwise not allowed
by the parser.
Anatol Belski [Tue, 2 Jan 2018 10:39:09 +0000 (11:39 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test for pdo_odbc
Anatol Belski [Tue, 2 Jan 2018 10:34:57 +0000 (11:34 +0100)]
Fix test for pdo_odbc
SqlServer requires parentheses to the TOP argument.
Stanislav Malyshev [Tue, 2 Jan 2018 08:12:33 +0000 (00:12 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix some int/long confusion issues in GMP
Stanislav Malyshev [Tue, 2 Jan 2018 08:10:27 +0000 (00:10 -0800)]
Fix some int/long confusion issues in GMP
mpz_setbit seems to have limit of INT_MAX * GMP_NUMB_BITS on
the number of bits supported, and will abort() if that limit
is exceeded.
Anatol Belski [Tue, 2 Jan 2018 06:50:18 +0000 (07:50 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Tue, 2 Jan 2018 06:49:53 +0000 (07:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Tue, 2 Jan 2018 06:49:09 +0000 (07:49 +0100)]
[ci skip] update NEWS
Xinchen Hui [Tue, 2 Jan 2018 05:57:56 +0000 (13:57 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
regenerated with newer re2c
Xinchen Hui [Tue, 2 Jan 2018 05:54:29 +0000 (13:54 +0800)]
regenerated with newer re2c
Xinchen Hui [Tue, 2 Jan 2018 05:50:46 +0000 (13:50 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Xinchen Hui [Tue, 2 Jan 2018 05:50:18 +0000 (13:50 +0800)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:/php-src:
Update NEWS
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Fix bug #74782: remove file name from output to avoid XSS
Xinchen Hui [Tue, 2 Jan 2018 05:49:58 +0000 (13:49 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
Update NEWS
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Fix bug #74782: remove file name from output to avoid XSS
Stanislav Malyshev [Tue, 2 Jan 2018 05:07:21 +0000 (21:07 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Fix bug #74782: remove file name from output to avoid XSS
Xinchen Hui [Tue, 2 Jan 2018 04:55:14 +0000 (12:55 +0800)]
year++
Xinchen Hui [Tue, 2 Jan 2018 04:54:07 +0000 (12:54 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
year++
Xinchen Hui [Tue, 2 Jan 2018 04:53:31 +0000 (12:53 +0800)]
year++
Stanislav Malyshev [Tue, 2 Jan 2018 04:52:34 +0000 (20:52 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update NEWS
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Fix bug #74782: remove file name from output to avoid XSS
Stanislav Malyshev [Tue, 2 Jan 2018 04:28:01 +0000 (20:28 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Fix bug #74782: remove file name from output to avoid XSS
Stanislav Malyshev [Tue, 2 Jan 2018 03:53:00 +0000 (19:53 -0800)]
Update NEWS
Christoph M. Becker [Wed, 29 Nov 2017 17:52:33 +0000 (18:52 +0100)]
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Due to a signedness confusion in `GetCode_` a corrupt GIF file can
trigger an infinite loop. Furthermore we make sure that a GIF without
any palette entries is treated as invalid *after* open palette entries
have been removed.
Stanislav Malyshev [Sun, 2 Jul 2017 20:29:37 +0000 (13:29 -0700)]
Fix bug #74782: remove file name from output to avoid XSS
Nikita Popov [Mon, 1 Jan 2018 20:30:18 +0000 (21:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 1 Jan 2018 20:23:10 +0000 (21:23 +0100)]
Fixed bug #75502
The string keys were not duplicated into persistent memory in this
case.
Jakub Zelenka [Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sat, 30 Dec 2017 17:34:01 +0000 (17:34 +0000)]
Use seialize_precision instead of precision in all json tests
Dmitry Stogov [Thu, 28 Dec 2017 11:08:38 +0000 (14:08 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75720 (File cache not populated after SHM runs full)
Dmitry Stogov [Thu, 28 Dec 2017 11:08:12 +0000 (14:08 +0300)]
Fixed bug #75720 (File cache not populated after SHM runs full)
Xinchen Hui [Thu, 28 Dec 2017 08:31:09 +0000 (16:31 +0800)]
Fixed bug #75742 (potential memleak in internal classes's static members)
Dmitry Stogov [Thu, 28 Dec 2017 08:20:43 +0000 (11:20 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed reference-counting
Dmitry Stogov [Thu, 28 Dec 2017 08:19:52 +0000 (11:19 +0300)]
Fixed reference-counting
Xinchen Hui [Wed, 27 Dec 2017 04:52:25 +0000 (12:52 +0800)]
Updated NEWS
Xinchen Hui [Wed, 27 Dec 2017 04:52:06 +0000 (12:52 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
Xinchen Hui [Wed, 27 Dec 2017 04:51:50 +0000 (12:51 +0800)]
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
Anatol Belski [Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert to Postgres 9.6, AppVeyor seems to have issues with 10
Anatol Belski [Fri, 22 Dec 2017 22:38:04 +0000 (23:38 +0100)]
Revert to Postgres 9.6, AppVeyor seems to have issues with 10
Anatol Belski [Fri, 22 Dec 2017 22:26:42 +0000 (23:26 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update tool path
Anatol Belski [Fri, 22 Dec 2017 22:25:24 +0000 (23:25 +0100)]
Update tool path
Anatol Belski [Fri, 22 Dec 2017 22:14:50 +0000 (23:14 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Switch AppVeyor to PostgreSQL 10 for tests
Anatol Belski [Fri, 22 Dec 2017 22:12:27 +0000 (23:12 +0100)]
Switch AppVeyor to PostgreSQL 10 for tests
Anatol Belski [Fri, 22 Dec 2017 18:01:02 +0000 (19:01 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
Anatol Belski [Fri, 22 Dec 2017 17:59:30 +0000 (18:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
Nikita Popov [Fri, 22 Dec 2017 17:22:30 +0000 (18:22 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 22 Dec 2017 17:22:33 +0000 (18:22 +0100)]
[ci skip] update NEWS
Dmitry Stogov [Thu, 21 Dec 2017 20:34:21 +0000 (23:34 +0300)]
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
(cherry picked from commit
37bf8bdc1494abb2ce5cac40e0be80e23682f851 )
Nikita Popov [Fri, 22 Dec 2017 17:11:38 +0000 (18:11 +0100)]
Fixed bug #73209
Nikita Popov [Fri, 22 Dec 2017 17:12:03 +0000 (18:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 22 Dec 2017 17:11:38 +0000 (18:11 +0100)]
Fixed bug #75242
Nikita Popov [Fri, 22 Dec 2017 17:01:16 +0000 (18:01 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 22 Dec 2017 17:00:17 +0000 (18:00 +0100)]
Fixed bug #75717
Nikita Popov [Fri, 22 Dec 2017 16:49:20 +0000 (17:49 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Anton Artamonov [Sat, 4 Nov 2017 12:51:33 +0000 (19:51 +0700)]
Fixed bug #70469
Don't generate an E_ERROR if we've already thrown an exception.
This interacts badly with error_get_last() checks.
Anatol Belski [Fri, 22 Dec 2017 15:45:25 +0000 (16:45 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix wrong return value for fail case in set attribute handler in pdo_odbc
Anatol Belski [Fri, 22 Dec 2017 15:41:46 +0000 (16:41 +0100)]
Fix wrong return value for fail case in set attribute handler in pdo_odbc
Anatol Belski [Fri, 22 Dec 2017 15:28:10 +0000 (16:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
pdo_odbc has no driver API for quoting, skip the test
Anatol Belski [Fri, 22 Dec 2017 15:22:12 +0000 (16:22 +0100)]
pdo_odbc has no driver API for quoting, skip the test
Dmitry Stogov [Thu, 21 Dec 2017 20:36:51 +0000 (23:36 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
Dmitry Stogov [Thu, 21 Dec 2017 20:35:23 +0000 (23:35 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
Dmitry Stogov [Thu, 21 Dec 2017 20:34:21 +0000 (23:34 +0300)]
Fixed bug #75579 (Interned strings buffer overflow may cause crash)
Anatol Belski [Thu, 21 Dec 2017 17:38:16 +0000 (18:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Ensure expected items delivered in same order
Anatol Belski [Thu, 21 Dec 2017 17:37:23 +0000 (18:37 +0100)]
Ensure expected items delivered in same order
Anatol Belski [Thu, 21 Dec 2017 14:43:04 +0000 (15:43 +0100)]
Update libmagic.patch
Riccardo Magliocchetti [Wed, 20 Dec 2017 18:07:30 +0000 (19:07 +0100)]
fileinfo: fix misleading indentation in libmagic
Anatol Belski [Thu, 21 Dec 2017 12:49:05 +0000 (13:49 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix segfault. Compile param --with-tsrm-pth=yes
Evgeny Kalashnikov [Thu, 21 Dec 2017 12:48:10 +0000 (13:48 +0100)]
Fix segfault. Compile param --with-tsrm-pth=yes
Anatol Belski [Wed, 20 Dec 2017 17:50:10 +0000 (18:50 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Templatize driver name in the expected string
Anatol Belski [Wed, 20 Dec 2017 17:46:56 +0000 (18:46 +0100)]
Templatize driver name in the expected string
Remi Collet [Tue, 19 Dec 2017 13:47:59 +0000 (14:47 +0100)]
NEWS
Remi Collet [Tue, 19 Dec 2017 13:46:32 +0000 (14:46 +0100)]
display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1)
Nikita Popov [Mon, 18 Dec 2017 20:44:36 +0000 (21:44 +0100)]
Document removal of opcache.fast_shutdown
[ci skip]
Jaromír Doleček [Sun, 17 Dec 2017 11:56:37 +0000 (12:56 +0100)]
Fixed bug #75616
PDO can be built shared on Darwin nowadays. There used to be issues
relating to symbol references between dynamically loaded shared
objects.
Jaromír Doleček [Sun, 17 Dec 2017 11:46:28 +0000 (12:46 +0100)]
Fix bug #75615
Remove -I without argument in pdo_mysql config.m4.
Xinchen Hui [Sun, 17 Dec 2017 01:42:01 +0000 (09:42 +0800)]
Updated NEWS