]>
granicus.if.org Git - php/log
Christoph M. Becker [Fri, 23 Sep 2016 13:22:45 +0000 (15:22 +0200)]
Fix FreeType tests using UTF-8 font file names
UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.
[1] <http://news.php.net/php.internals.win/1142>
Julien Pauli [Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c
Julien Pauli [Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Formatting. Fix possible memory corruption in FPM SHM management
fix every work call mmap
Julien Pauli [Fri, 23 Sep 2016 11:24:31 +0000 (13:24 +0200)]
Formatting. Fix possible memory corruption in FPM SHM management
tom916 [Fri, 16 Sep 2016 14:37:09 +0000 (22:37 +0800)]
fix every work call mmap
fix fpm_scoreboard_free
Christoph M. Becker [Fri, 23 Sep 2016 10:55:13 +0000 (12:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 23 Sep 2016 10:29:37 +0000 (12:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 22 Sep 2016 09:52:10 +0000 (11:52 +0200)]
Rework FreeType related tests
Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.
Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.
Anatol Belski [Fri, 23 Sep 2016 09:26:03 +0000 (11:26 +0200)]
update NEWS
Anatol Belski [Fri, 23 Sep 2016 09:25:33 +0000 (11:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
phpdbg next command must stop when leaving function
Anatol Belski [Fri, 23 Sep 2016 09:24:55 +0000 (11:24 +0200)]
update NEWS
Bob Weinand [Fri, 23 Sep 2016 01:29:37 +0000 (03:29 +0200)]
phpdbg next command must stop when leaving function
Anatol Belski [Thu, 22 Sep 2016 23:55:17 +0000 (01:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
Anatol Belski [Thu, 22 Sep 2016 23:52:42 +0000 (01:52 +0200)]
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
Anatol Belski [Thu, 22 Sep 2016 15:03:49 +0000 (17:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs versions
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:03:12 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:02:54 +0000 (17:02 +0200)]
update libs versions
Anatol Belski [Thu, 22 Sep 2016 15:01:02 +0000 (17:01 +0200)]
update libs versions
Nikita Popov [Thu, 22 Sep 2016 10:50:29 +0000 (12:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 22 Sep 2016 10:48:38 +0000 (12:48 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Márcio Almada [Mon, 19 Sep 2016 16:42:07 +0000 (12:42 -0400)]
fix bug related to #865
In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.
This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
Nikita Popov [Thu, 22 Sep 2016 10:38:48 +0000 (12:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]
Fix bug #69579
Nikita Popov [Thu, 22 Sep 2016 10:34:55 +0000 (12:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
John Boehr [Thu, 22 Sep 2016 03:09:45 +0000 (20:09 -0700)]
Fix bug #69579
Anatol Belski [Thu, 22 Sep 2016 10:07:37 +0000 (12:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Anatol Belski [Thu, 22 Sep 2016 10:06:25 +0000 (12:06 +0200)]
update NEWS
Anatol Belski [Thu, 22 Sep 2016 10:04:37 +0000 (12:04 +0200)]
update NEWS
Anatol Belski [Thu, 22 Sep 2016 09:51:39 +0000 (11:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73126 Cannot pass parameter 1 by reference
Anatol Belski [Thu, 22 Sep 2016 09:49:35 +0000 (11:49 +0200)]
Fixed bug #73126 Cannot pass parameter 1 by reference
Adam Baratz [Wed, 21 Sep 2016 20:23:58 +0000 (16:23 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Limit size of result set for test query
Adam Baratz [Wed, 21 Sep 2016 20:21:33 +0000 (16:21 -0400)]
Limit size of result set for test query
This result set can be very large, depending on the database. This change
ensures this test won't be slow.
Adam Baratz [Wed, 21 Sep 2016 19:15:18 +0000 (15:15 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
PHP bug 67130: nextRowset should work with unfetched rows
Adam Baratz [Wed, 21 Sep 2016 18:29:42 +0000 (14:29 -0400)]
update NEWS
Peter LeBrun [Fri, 1 Jul 2016 19:44:06 +0000 (15:44 -0400)]
PHP bug 67130: nextRowset should work with unfetched rows
Adam Baratz [Wed, 21 Sep 2016 16:02:17 +0000 (12:02 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move dtor before memory freed to avoid invalid read
Adam Baratz [Wed, 21 Sep 2016 16:00:19 +0000 (12:00 -0400)]
Move dtor before memory freed to avoid invalid read
Xinchen Hui [Wed, 21 Sep 2016 09:20:35 +0000 (17:20 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed skip
Xinchen Hui [Wed, 21 Sep 2016 09:20:02 +0000 (17:20 +0800)]
Fixed skip
Christoph M. Becker [Tue, 20 Sep 2016 10:17:06 +0000 (12:17 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 20 Sep 2016 10:16:16 +0000 (12:16 +0200)]
Skip failing FreeType tests for now
Dmitry Stogov [Tue, 20 Sep 2016 09:34:58 +0000 (12:34 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
Dmitry Stogov [Tue, 20 Sep 2016 09:34:40 +0000 (12:34 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
Dmitry Stogov [Tue, 20 Sep 2016 09:29:57 +0000 (12:29 +0300)]
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
Christoph M. Becker [Mon, 19 Sep 2016 23:32:32 +0000 (01:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 19 Sep 2016 23:25:08 +0000 (01:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 19 Sep 2016 23:05:57 +0000 (01:05 +0200)]
Merge branch 'pull-request/1845' into PHP-5.6
George Wang [Mon, 19 Sep 2016 14:50:21 +0000 (10:50 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
George Wang [Mon, 19 Sep 2016 14:49:26 +0000 (10:49 -0400)]
Merge branch 'PHP-5.6' into PHP-7.0
George Wang [Mon, 19 Sep 2016 14:46:46 +0000 (10:46 -0400)]
Fix wrong year in previous commit.
Julien Pauli [Mon, 19 Sep 2016 14:12:33 +0000 (16:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json_encoder.c
Julien Pauli [Mon, 19 Sep 2016 14:08:37 +0000 (16:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Do not wrap user exception in case of custom JSON serialization
Conflicts:
ext/json/json.c
Julien Pauli [Mon, 19 Sep 2016 14:06:12 +0000 (16:06 +0200)]
Do not wrap user exception in case of custom JSON serialization
Julien Pauli [Mon, 19 Sep 2016 13:20:22 +0000 (15:20 +0200)]
Updated NEWS
Julien Pauli [Mon, 19 Sep 2016 13:01:54 +0000 (15:01 +0200)]
Fix 73113 - Segfault with throwing JsonSerializable
TAKEKOSHI Akishige [Sun, 18 Sep 2016 06:46:40 +0000 (15:46 +0900)]
when needle is short, Sunday algorithm is slower than glibc memchr()
Nikita Popov [Sat, 17 Sep 2016 20:56:02 +0000 (22:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 17 Sep 2016 20:54:25 +0000 (22:54 +0200)]
Add test for bug #72489
Nikita Popov [Fri, 22 Apr 2016 15:48:35 +0000 (17:48 +0200)]
Make zval_ptr_dtor / _zval_dtor_func more robust
In particular, allow arrays with refcount>1, like we already allow
for all other types. _zval_dtor_func is now the same as
_zval_dtor_func_for_ptr with an extra refcount decrement check at
the start. At this point we might as well drop it...
Cherry-pick of
ded69ee6e6039d56ee7b65b1a578ed1e3d1859da from
PHP-7.1.
Christoph M. Becker [Fri, 16 Sep 2016 21:49:10 +0000 (23:49 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 16 Sep 2016 21:42:48 +0000 (23:42 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 16 Sep 2016 21:41:10 +0000 (23:41 +0200)]
Fix #73100: session_destroy null dereference in ps_files_path_create
Nikita Popov [Fri, 16 Sep 2016 19:06:11 +0000 (21:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Michael Orlitzky [Fri, 16 Sep 2016 19:03:01 +0000 (21:03 +0200)]
Disable add/sub asm for gcc 4.9 pic/pie builds
Xinchen Hui [Fri, 16 Sep 2016 12:56:29 +0000 (20:56 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updte NEWS
Fixed bug #72505 (readfile() mangles files larger than 2G)
Xinchen Hui [Fri, 16 Sep 2016 12:55:54 +0000 (20:55 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updte NEWS
Fixed bug #72505 (readfile() mangles files larger than 2G)
Xinchen Hui [Fri, 16 Sep 2016 12:55:37 +0000 (20:55 +0800)]
Updte NEWS
Xinchen Hui [Tue, 28 Jun 2016 03:11:25 +0000 (11:11 +0800)]
Fixed bug #72505 (readfile() mangles files larger than 2G)
Dmitry Stogov [Fri, 16 Sep 2016 11:03:05 +0000 (14:03 +0300)]
Prevent optimization of huge functions.
Christoph M. Becker [Fri, 16 Sep 2016 09:48:23 +0000 (11:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 16 Sep 2016 09:40:36 +0000 (11:40 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 16 Sep 2016 09:31:21 +0000 (11:31 +0200)]
Fix #73003: Integer Overflow in gdImageWebpCtx of gd_webp.c
We add the missing integer overflow check to avoid potential buffer overflows.
Remi Collet [Thu, 15 Sep 2016 13:36:39 +0000 (15:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test (32bits)
Remi Collet [Thu, 15 Sep 2016 13:36:26 +0000 (15:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test (32bits)
Remi Collet [Thu, 15 Sep 2016 13:32:39 +0000 (15:32 +0200)]
fix test (32bits)
Remi Collet [Thu, 15 Sep 2016 11:29:44 +0000 (13:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix ZTS build
Remi Collet [Thu, 15 Sep 2016 11:29:26 +0000 (13:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix ZTS build
Remi Collet [Thu, 15 Sep 2016 11:27:20 +0000 (13:27 +0200)]
fix ZTS build
Ferenc Kovacs [Thu, 15 Sep 2016 09:38:49 +0000 (11:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 15 Sep 2016 09:37:30 +0000 (11:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 15 Sep 2016 09:35:46 +0000 (11:35 +0200)]
update NEWS
Christoph M. Becker [Wed, 14 Sep 2016 22:55:41 +0000 (00:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 14 Sep 2016 22:50:49 +0000 (00:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 14 Sep 2016 22:34:55 +0000 (00:34 +0200)]
Fix and reactivate regression test for bug #50194
Apparently, different FreeType versions render the string differently, so
we have to cater to these slight differences. Unfortunately, the testing
framework doesn't yet offer a clean API for this, so we work around the
limitations by parsing and checking the output of test_image_equals_file().
Adam Baratz [Wed, 14 Sep 2016 21:44:56 +0000 (17:44 -0400)]
Mark change with relevant bug number
Christoph M. Becker [Wed, 14 Sep 2016 18:03:00 +0000 (20:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 14 Sep 2016 18:02:05 +0000 (20:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 14 Sep 2016 18:00:30 +0000 (20:00 +0200)]
Skip ext/gd/tests/bug50194.phpt for now
There are apparently issues with the font rendering with different freetype
version; I'll have a look at this issue ASAP.
Adam Baratz [Wed, 14 Sep 2016 15:19:31 +0000 (11:19 -0400)]
Add pdo_dblib changes
Adam Baratz [Wed, 14 Sep 2016 15:07:26 +0000 (11:07 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip test for early TDS versions
Adam Baratz [Wed, 14 Sep 2016 13:00:46 +0000 (09:00 -0400)]
Skip test for early TDS versions
Christoph M. Becker [Wed, 14 Sep 2016 13:59:44 +0000 (15:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 14 Sep 2016 13:49:25 +0000 (15:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 14 Sep 2016 12:59:17 +0000 (14:59 +0200)]
Fix #50194: imagettftext broken on transparent background w/o alphablending
We must not draw the background pixels of the character glyphs, what has
already been fixed in GD 2.0.26.
Davey Shafik [Wed, 14 Sep 2016 12:26:18 +0000 (12:26 +0000)]
Update NEWS for 7.1.0RC3
Jakub Zelenka [Wed, 14 Sep 2016 11:34:39 +0000 (12:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Wed, 14 Sep 2016 11:31:45 +0000 (12:31 +0100)]
Sync NEWS for bug #73072
Christoph M. Becker [Wed, 14 Sep 2016 10:43:22 +0000 (12:43 +0200)]
Fix #72430: [] operator not supported for strings
Anatol Belski [Wed, 14 Sep 2016 10:07:38 +0000 (12:07 +0200)]
fix erroneous resource destruction
Davey Shafik [Wed, 14 Sep 2016 02:38:39 +0000 (19:38 -0700)]
Sync NEWS