]>
granicus.if.org Git - php/log
Anatol Belski [Fri, 23 Sep 2016 09:26:24 +0000 (11:26 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
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:56 +0000 (03:29 +0200)]
Merge branch 'PHP-7.0'
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:35 +0000 (01:55 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
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:05:51 +0000 (17:05 +0200)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Sep 2016 15:04:06 +0000 (17:04 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update libs versions
update libs versions
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
Dmitry Stogov [Thu, 22 Sep 2016 14:58:45 +0000 (17:58 +0300)]
Removed impossible condition
Nikita Popov [Thu, 22 Sep 2016 10:50:36 +0000 (12:50 +0200)]
Merge branch 'PHP-7.1'
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:39:00 +0000 (12:39 +0200)]
Merge branch 'PHP-7.1'
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:35:29 +0000 (12:35 +0200)]
Merge branch 'PHP-7.1'
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:08:06 +0000 (12:08 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
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:44 +0000 (12:06 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
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:53 +0000 (11:51 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73126 Cannot pass parameter 1 by reference
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:24:15 +0000 (16:24 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Limit size of result set for test query
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:54 +0000 (15:15 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
PHP bug 67130: nextRowset should work with unfetched rows
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:42 +0000 (12:02 -0400)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Move dtor before memory freed to avoid invalid read
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:48 +0000 (17:20 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed skip
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:18:55 +0000 (12:18 +0200)]
Merge branch 'PHP-7.1'
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:35:14 +0000 (12:35 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed inconsistent meaning of zend_startup_module_ex() return value used in zend_hash_apply()
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: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.