]>
granicus.if.org Git - php/log
Joe Watkins [Fri, 30 Sep 2016 06:21:01 +0000 (07:21 +0100)]
fix user filter bug
Christoph M. Becker [Mon, 19 Sep 2016 23:38:28 +0000 (01:38 +0200)]
Merge branch 'PHP-7.1'
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
Christoph M. Becker [Mon, 19 Sep 2016 22:10:49 +0000 (00:10 +0200)]
Sync with libgd wrt. compilation units
* integrate gd_arc.c into gd.c (as of gd-2.1.0-alpha1)
* rename gd_color.c to gd_color_match.c (as of gd-2.1.0-alpha1)
* remove mathmake.c (as of GD_2_0_34RC1)
* rename xbm.c to gd_xbm.c (as of gd-2.1.0-alpha1)
Christoph M. Becker [Mon, 19 Sep 2016 21:48:23 +0000 (23:48 +0200)]
Remove unused compilation unit
gd_arc_f_buggy.c has already been removed in GD 2.0.34RC, so we're also
getting rid of the file.
Christoph M. Becker [Mon, 19 Sep 2016 17:00:58 +0000 (19:00 +0200)]
Port variable image resolution support from libgd 2.1.0
The PHP binding for this feature will be submitted as a separate PR.
Christoph M. Becker [Mon, 19 Sep 2016 14:49:06 +0000 (16:49 +0200)]
Port gdImageSetStyle() overflow check from libgd 2.0.29
George Wang [Mon, 19 Sep 2016 14:52:58 +0000 (10:52 -0400)]
Merge branch 'PHP-7.1'
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:43:17 +0000 (16:43 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Do not wrap user exception in case of custom JSON serialization
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:25:47 +0000 (15:25 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Updated NEWS
Fix 73113 - Segfault with throwing JsonSerializable
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
Xinchen Hui [Sun, 18 Sep 2016 08:37:20 +0000 (16:37 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
when needle is short, Sunday algorithm is slower than glibc memchr()
TAKEKOSHI Akishige [Sun, 18 Sep 2016 06:46:40 +0000 (15:46 +0900)]
when needle is short, Sunday algorithm is slower than glibc memchr()
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:57:07 +0000 (22:57 +0200)]
Merge branch 'PHP-7.1'
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.
Anatol Belski [Sat, 17 Sep 2016 11:10:01 +0000 (13:10 +0200)]
fix argon2 lib names
Christoph M. Becker [Fri, 16 Sep 2016 22:02:30 +0000 (00:02 +0200)]
Merge branch '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:28:39 +0000 (21:28 +0200)]
Use zend_string_free instead of efree
Fingers crossed I didn't break the build.
Nikita Popov [Fri, 16 Sep 2016 19:06:52 +0000 (21:06 +0200)]
Merge branch 'PHP-7.1'
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:55 +0000 (20:56 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Updte NEWS
Fixed bug #72505 (readfile() mangles files larger than 2G)
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:56 +0000 (14:03 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Prevent optimization of huge functions.
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:54:18 +0000 (11:54 +0200)]
Merge branch 'PHP-7.1'
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:47 +0000 (15:36 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test (32bits)
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:30:08 +0000 (13:30 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix ZTS build
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
Christoph M. Becker [Thu, 15 Sep 2016 11:18:54 +0000 (13:18 +0200)]
Port optimization from external libgd
The functionality is identical, but we save two function calls for partially
transparent pixels.
Christoph M. Becker [Thu, 15 Sep 2016 11:04:30 +0000 (13:04 +0200)]
Removed unused function
The earlier gdAlphaBlend() has been replaced with commit
1286d9e2 , and has
been renamed to gdAlphaBlendOld(). The old function is, however, not used,
and after more than 9 years we're pretty sure we won't need it anymore.
Ferenc Kovacs [Thu, 15 Sep 2016 09:40:22 +0000 (11:40 +0200)]
Merge branch 'PHP-7.1'
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
Dmitry Stogov [Thu, 15 Sep 2016 00:07:31 +0000 (03:07 +0300)]
Special handling for $php_errormsg and $http_response_header.
Christoph M. Becker [Wed, 14 Sep 2016 23:08:29 +0000 (01:08 +0200)]
Merge branch 'PHP-7.1'
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().
Yasuo Ohgaki [Wed, 14 Sep 2016 21:57:29 +0000 (06:57 +0900)]
Fix bug number in NEWS
Adam Baratz [Wed, 14 Sep 2016 21:44:56 +0000 (17:44 -0400)]
Mark change with relevant bug number
Yasuo Ohgaki [Wed, 14 Sep 2016 21:26:31 +0000 (06:26 +0900)]
Implemented Bug #68776 mail() does not have mail header injection prevention for additional headers
(PR 2060)
Christoph M. Becker [Wed, 14 Sep 2016 21:38:02 +0000 (23:38 +0200)]
Remove unnecessary #ifdef
The bundled libgd also defines gdImageAlphaBlending(), and this is the
preferred way to set the alphaBlendingFlag member anyway.
Christoph M. Becker [Wed, 14 Sep 2016 18:03:42 +0000 (20:03 +0200)]
Merge branch 'PHP-7.1'
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:57 +0000 (11:07 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Skip test for early TDS versions
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 15:01:41 +0000 (17:01 +0200)]
Remove unused code which is also not there in external libgd
Christoph M. Becker [Wed, 14 Sep 2016 14:11:04 +0000 (16:11 +0200)]
Merge branch 'PHP-7.1'
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:35:53 +0000 (12:35 +0100)]
Merge branch 'PHP-7.1'
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:59 +0000 (12:43 +0200)]
Merge branch 'PHP-7.1'
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:09:58 +0000 (12:09 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix erroneous resource destruction
Sync NEWS
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
Christoph M. Becker [Tue, 13 Sep 2016 22:28:36 +0000 (00:28 +0200)]
Remove effectless --enable-gd-native-ttf and USE_GD_IMGSTRTTF
--enable-gd-native-ttf did set USE_GD_IMGSTRTTF, which is otherwise unused
as of commit
8a90aad3 (i.e. PHP 5.5.0), at least.
Adam Baratz [Tue, 13 Sep 2016 21:16:46 +0000 (17:16 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add special case for earlier versions of TDS
Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
Free error and message strings when cleaning up PDO instances that use pdo_dblib
Add common suite
Adam Baratz [Tue, 13 Sep 2016 21:02:53 +0000 (17:02 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add special case for earlier versions of TDS
Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
Free error and message strings when cleaning up PDO instances that use pdo_dblib
Add common suite
Adam Baratz [Tue, 13 Sep 2016 21:01:51 +0000 (17:01 -0400)]
Add special case for earlier versions of TDS
Adam Baratz [Tue, 13 Sep 2016 20:43:33 +0000 (16:43 -0400)]
Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
Adam Baratz [Tue, 13 Sep 2016 20:43:30 +0000 (16:43 -0400)]
Free error and message strings when cleaning up PDO instances that use pdo_dblib
Adam Baratz [Tue, 13 Sep 2016 20:43:25 +0000 (16:43 -0400)]
Add common suite
Adam Baratz [Tue, 13 Sep 2016 20:39:29 +0000 (16:39 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Explicitly allow NULL values for dblib compatibility
Add dblib-specific query
Remove test cases don't test distinct behavior