]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 20:21:34 +0000 (22:21 +0200)]
It looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 18:30:40 +0000 (20:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Put php-sdk-2.0.12beta1 for AppVeyor
Anatol Belski [Wed, 11 Oct 2017 18:27:27 +0000 (20:27 +0200)]
Put php-sdk-2.0.12beta1 for AppVeyor
Quite some tool upgrades there, especially re2c 1.0.2
Christoph M. Becker [Wed, 11 Oct 2017 15:29:02 +0000 (17:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Christoph M. Becker [Wed, 11 Oct 2017 15:05:53 +0000 (17:05 +0200)]
Merge branch 'pull-request/2798' into PHP-7.0
* pull-request/2798:
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Christoph M. Becker [Wed, 11 Oct 2017 12:43:30 +0000 (14:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use PHP_VERSION for exif
Christoph M. Becker [Wed, 11 Oct 2017 12:42:02 +0000 (14:42 +0200)]
Merge branch 'pull-request/2799' into PHP-7.0
* pull-request/2799:
Use PHP_VERSION for exif
Joe Watkins [Tue, 10 Oct 2017 15:12:36 +0000 (16:12 +0100)]
bump version
Christoph M. Becker [Tue, 10 Oct 2017 11:55:45 +0000 (13:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Add NEWS entry for bug #75349
Christoph M. Becker [Tue, 10 Oct 2017 11:54:52 +0000 (13:54 +0200)]
[ci skip] Add NEWS entry for bug #75349
Anatol Belski [Tue, 10 Oct 2017 10:59:14 +0000 (12:59 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix re2c version detection
Anatol Belski [Tue, 10 Oct 2017 08:52:52 +0000 (10:52 +0200)]
Fix re2c version detection
Anatol Belski [Tue, 10 Oct 2017 06:27:37 +0000 (08:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move dev to 7.0.26
Anatol Belski [Tue, 10 Oct 2017 06:26:04 +0000 (08:26 +0200)]
Move dev to 7.0.26
Anatol Belski [Mon, 9 Oct 2017 13:38:21 +0000 (15:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix array access on undeclared properties in DateInterval
Anatol Belski [Mon, 9 Oct 2017 13:35:38 +0000 (15:35 +0200)]
Fix array access on undeclared properties in DateInterval
Anatol Belski [Mon, 9 Oct 2017 11:07:40 +0000 (13:07 +0200)]
Fix ftok() multibyte path support
Sara Golemon [Sat, 7 Oct 2017 14:13:54 +0000 (10:13 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Sara Golemon [Sat, 7 Oct 2017 14:08:34 +0000 (10:08 -0400)]
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Christoph M. Becker [Fri, 6 Oct 2017 14:46:22 +0000 (16:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Christoph M. Becker [Fri, 6 Oct 2017 14:45:07 +0000 (16:45 +0200)]
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Of course, reflection has to know that as well.
Nikita Popov [Thu, 5 Oct 2017 10:25:20 +0000 (12:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Mathieu CARBONNEAUX [Wed, 4 Oct 2017 23:34:20 +0000 (01:34 +0200)]
Fixed bug #75311
Peter Kokot [Sun, 1 Oct 2017 16:27:11 +0000 (18:27 +0200)]
Use PHP_VERSION for exif
Dmitry Stogov [Wed, 4 Oct 2017 13:38:55 +0000 (16:38 +0300)]
Fixed rarely possible use-after-free
Dmitry Stogov [Wed, 4 Oct 2017 06:58:32 +0000 (09:58 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bumped ext/oci8 version
Use dereferenced value
Fixed compilation errors
Restored code for BOOL variables
Fixed few ext/oci8 bugs
Dmitry Stogov [Wed, 4 Oct 2017 06:56:25 +0000 (09:56 +0300)]
Bumped ext/oci8 version
Dmitry Stogov [Wed, 4 Oct 2017 06:49:40 +0000 (09:49 +0300)]
Merge branch 'oci8_fix' into PHP-7.0
* oci8_fix:
Use dereferenced value
Fixed compilation errors
Restored code for BOOL variables
Fixed few ext/oci8 bugs
Dmitry Stogov [Tue, 3 Oct 2017 07:49:56 +0000 (10:49 +0300)]
Use dereferenced value
Joe Watkins [Tue, 3 Oct 2017 06:22:04 +0000 (07:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Typo in status.html
Viktor Szépe [Fri, 29 Sep 2017 12:36:23 +0000 (14:36 +0200)]
Typo in status.html
feet needs -> fit needs
Joe Watkins [Tue, 3 Oct 2017 06:19:00 +0000 (07:19 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #74905
Peter Kokot [Thu, 28 Sep 2017 01:13:18 +0000 (03:13 +0200)]
Fix bug #74905
Joe Watkins [Tue, 3 Oct 2017 06:15:02 +0000 (07:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove ident gitattribute for ext/zip/php_zip.c
Peter Kokot [Wed, 27 Sep 2017 23:17:04 +0000 (01:17 +0200)]
Remove ident gitattribute for ext/zip/php_zip.c
Dmitry Stogov [Tue, 3 Oct 2017 06:08:28 +0000 (09:08 +0300)]
Fixed compilation errors
Dmitry Stogov [Mon, 2 Oct 2017 14:04:26 +0000 (17:04 +0300)]
Restored code for BOOL variables
Remi Collet [Mon, 2 Oct 2017 09:26:08 +0000 (11:26 +0200)]
NEWS
Remi Collet [Mon, 2 Oct 2017 09:25:23 +0000 (11:25 +0200)]
Fixed bug #75303 sha3 hangs on bigendian
Fabien Villepinte [Sun, 1 Oct 2017 09:27:16 +0000 (11:27 +0200)]
Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
Andrea Faulds [Fri, 29 Sep 2017 20:38:30 +0000 (21:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Fri, 29 Sep 2017 20:38:08 +0000 (21:38 +0100)]
Fix bug #75290
Xinchen Hui [Fri, 29 Sep 2017 03:16:32 +0000 (11:16 +0800)]
Fixed bug #75267 (possible &/&& mixup)
Sara Golemon [Thu, 28 Sep 2017 14:45:51 +0000 (10:45 -0400)]
Fix word alignment on ILP64.
Anatol Belski [Thu, 28 Sep 2017 13:44:40 +0000 (15:44 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Apply upstream patch for CVE-2016-1283
Anatol Belski [Thu, 28 Sep 2017 13:40:49 +0000 (15:40 +0200)]
Apply upstream patch for CVE-2016-1283
Fix bug #75207, see also
https://bugzilla.redhat.com/show_bug.cgi?id=
1295385
https://vcs.pcre.org/pcre?view=revision&revision=1636
Anatol Belski [Thu, 28 Sep 2017 11:18:31 +0000 (13:18 +0200)]
Fix mkdir() special case for path length < 260 and > 248
Dmitry Stogov [Wed, 27 Sep 2017 14:16:24 +0000 (17:16 +0300)]
Fixed bug #75255 (Request hangs and not finish)
Joe Watkins [Wed, 27 Sep 2017 05:20:34 +0000 (06:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix CGI m4 config message when CGI is disabled
Peter Kokot [Sun, 24 Sep 2017 19:09:09 +0000 (21:09 +0200)]
Fix CGI m4 config message when CGI is disabled
Joe Watkins [Wed, 27 Sep 2017 05:15:26 +0000 (06:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75248 and #75251
Peter Kokot [Fri, 22 Sep 2017 20:41:51 +0000 (22:41 +0200)]
Fix bug #75248 and #75251
Joe Watkins [Wed, 27 Sep 2017 05:07:46 +0000 (06:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #75220 - Segfault when calling is_callable on parent
Nester [Mon, 18 Sep 2017 08:19:47 +0000 (08:19 +0000)]
Fixed #75220 - Segfault when calling is_callable on parent
Anatol Belski [Mon, 25 Sep 2017 19:58:18 +0000 (21:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove some old sapi/apache_hooks and sapi/apache leftovers
Peter Kokot [Sun, 24 Sep 2017 22:23:59 +0000 (00:23 +0200)]
Remove some old sapi/apache_hooks and sapi/apache leftovers
Dmitry Stogov [Mon, 25 Sep 2017 09:22:35 +0000 (12:22 +0300)]
Added missed ~
Dmitry Stogov [Mon, 25 Sep 2017 09:03:47 +0000 (12:03 +0300)]
Fixed type inference
Xinchen Hui [Sun, 24 Sep 2017 09:24:43 +0000 (17:24 +0800)]
Update NEWS
Xinchen Hui [Sun, 24 Sep 2017 09:24:23 +0000 (17:24 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Compiler warning
Xinchen Hui [Sun, 24 Sep 2017 09:24:11 +0000 (17:24 +0800)]
Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
Xinchen Hui [Sun, 24 Sep 2017 09:19:05 +0000 (17:19 +0800)]
Compiler warning
Nikita Popov [Sun, 24 Sep 2017 06:54:24 +0000 (08:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 24 Sep 2017 06:53:27 +0000 (08:53 +0200)]
Fixed bug #75252
Anatol Belski [Thu, 21 Sep 2017 08:32:47 +0000 (10:32 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix thread safety
Anatol Belski [Thu, 21 Sep 2017 08:32:09 +0000 (10:32 +0200)]
Fix thread safety
Andrea Faulds [Wed, 20 Sep 2017 23:03:33 +0000 (00:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Wed, 20 Sep 2017 23:02:52 +0000 (00:02 +0100)]
Fix bug #75236
Christoph M. Becker [Wed, 20 Sep 2017 13:46:31 +0000 (15:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
Dmitry Stogov [Wed, 20 Sep 2017 13:46:04 +0000 (16:46 +0300)]
Fixed few ext/oci8 bugs
Christoph M. Becker [Wed, 20 Sep 2017 13:36:50 +0000 (15:36 +0200)]
Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
We must not overwrite the SPL_DLLIST_IT_FIX flag when changing the
iterator mode.
Anatol Belski [Mon, 18 Sep 2017 10:06:23 +0000 (12:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix the version check causing the test fail
Anatol Belski [Mon, 18 Sep 2017 10:04:31 +0000 (12:04 +0200)]
Fix the version check causing the test fail
Anatol Belski [Mon, 18 Sep 2017 07:36:29 +0000 (09:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update lib_versions.txt
Anatol Belski [Mon, 18 Sep 2017 07:34:58 +0000 (09:34 +0200)]
Update lib_versions.txt
Anatol Belski [Fri, 15 Sep 2017 21:05:25 +0000 (23:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next binary SDK version for AppVeyor
Anatol Belski [Fri, 15 Sep 2017 21:04:15 +0000 (23:04 +0200)]
Move to next binary SDK version for AppVeyor
Anatol Belski [Wed, 13 Sep 2017 13:44:41 +0000 (15:44 +0200)]
[ci skip] update NEWS
Fix format
Anatol Belski [Wed, 13 Sep 2017 12:08:25 +0000 (14:08 +0200)]
Fixed bug #75018, fixed bug #75177
Both are caused by the same cast issue in mysqlnd on 32-bit.
Dmitry Stogov [Tue, 12 Sep 2017 22:46:12 +0000 (01:46 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Properly update string type flags
Dmitry Stogov [Tue, 12 Sep 2017 22:45:57 +0000 (01:45 +0300)]
Properly update string type flags
Dmitry Stogov [Tue, 12 Sep 2017 21:15:08 +0000 (00:15 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Properly update string type flags"
Dmitry Stogov [Tue, 12 Sep 2017 21:14:39 +0000 (00:14 +0300)]
Revert "Properly update string type flags"
This reverts commit
99b1a62d559f993ed02c50e6a4298c4bd2dcd33c.
Dmitry Stogov [Tue, 12 Sep 2017 20:47:39 +0000 (23:47 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed test
Dmitry Stogov [Tue, 12 Sep 2017 20:47:22 +0000 (23:47 +0300)]
Fixed test
Dmitry Stogov [Tue, 12 Sep 2017 20:43:42 +0000 (23:43 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Properly update string type flags
Dmitry Stogov [Tue, 12 Sep 2017 20:42:51 +0000 (23:42 +0300)]
Properly update string type flags
Anatol Belski [Tue, 12 Sep 2017 16:18:44 +0000 (18:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix test failure on 32-bit
Anatol Belski [Tue, 12 Sep 2017 16:17:28 +0000 (18:17 +0200)]
Fix test failure on 32-bit
Joe Watkins [Tue, 12 Sep 2017 14:34:30 +0000 (15:34 +0100)]
bump versions
Remi Collet [Tue, 12 Sep 2017 11:03:39 +0000 (13:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
drop symbol definition, and not defined anywhere
Remi Collet [Tue, 12 Sep 2017 11:03:18 +0000 (13:03 +0200)]
drop symbol definition, and not defined anywhere
Anatol Belski [Tue, 12 Sep 2017 10:18:01 +0000 (12:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Tue, 12 Sep 2017 10:17:46 +0000 (12:17 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 12 Sep 2017 10:17:12 +0000 (12:17 +0200)]
[ci skip] update NEWS
Anatol Belski [Tue, 12 Sep 2017 10:13:42 +0000 (12:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75193 segfault in collator_convert_object_to_string
Remi Collet [Tue, 12 Sep 2017 07:16:24 +0000 (09:16 +0200)]
Fixed bug #75193 segfault in collator_convert_object_to_string
Anatol Belski [Tue, 12 Sep 2017 07:03:07 +0000 (09:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move dev to 7.0.25
Anatol Belski [Tue, 12 Sep 2017 07:02:01 +0000 (09:02 +0200)]
Move dev to 7.0.25