]>
granicus.if.org Git - php/log
Anatol Belski [Fri, 20 Oct 2017 11:57:44 +0000 (13:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync some tests for compat with ICU 58.1+
Anatol Belski [Fri, 20 Oct 2017 11:56:58 +0000 (13:56 +0200)]
Sync some tests for compat with ICU 58.1, PHP 7.1+ part
Anatol Belski [Fri, 20 Oct 2017 11:55:32 +0000 (13:55 +0200)]
Sync some tests for compat with ICU 58.1+
Anatol Belski [Fri, 20 Oct 2017 09:28:51 +0000 (11:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add skip for incompatible ICU version
Anatol Belski [Fri, 20 Oct 2017 09:27:54 +0000 (11:27 +0200)]
Add skip for incompatible ICU version
Joe Watkins [Thu, 19 Oct 2017 11:02:34 +0000 (12:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
Nester [Mon, 9 Oct 2017 14:26:44 +0000 (14:26 +0000)]
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
Joe Watkins [Thu, 19 Oct 2017 10:53:50 +0000 (11:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update .editorconfig with some more configs
Peter Kokot [Wed, 11 Oct 2017 21:20:57 +0000 (23:20 +0200)]
Update .editorconfig with some more configs
Added support for .awk, .w32, .bat, .mk, .frag, .m4, .sh, .php, .phpt,
and Markdown files based on the current most used coding style in the
php-src repository.
Herman J. Radtke III [Sat, 14 Oct 2017 17:50:30 +0000 (10:50 -0700)]
Fix issue with zend signals in php_request_startup
The zend_signals_activate() function is called in php_request_startup()
even if `--disable-zend-signals` is used. This causes uninitialized
variables to be used on ZTS builds.
This was removed in 7.1 in
c870633 . Removing guards from the SAPIs
should be fine, but removing the guard from main/main.c prevents anyone
using the static embedded library to integrate PHP into their programs.
For more details, see the "Additional remark" section in
https://bugs.php.net/bug.php?id=74149
Joe Watkins [Thu, 19 Oct 2017 10:40:05 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Escape newline on curl config.m4
Ryan Volz [Thu, 19 Oct 2017 00:49:17 +0000 (20:49 -0400)]
Escape newline on curl config.m4
Anatol Belski [Wed, 18 Oct 2017 15:46:40 +0000 (17:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to php-sdk-2.0.0beta3 for Appveyor
Anatol Belski [Wed, 18 Oct 2017 15:45:33 +0000 (17:45 +0200)]
Move to php-sdk-2.0.0beta3 for Appveyor
Supposed to fix sporadic tool crashes on the test image
Anatol Belski [Wed, 18 Oct 2017 14:24:23 +0000 (16:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Backport
7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
Anatol Belski [Wed, 18 Oct 2017 14:02:56 +0000 (16:02 +0200)]
Anatol Belski [Tue, 17 Oct 2017 13:34:42 +0000 (15:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
One more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:32:47 +0000 (15:32 +0200)]
One more folder to delete in AppVeyor image
Tianfang Yang [Mon, 16 Oct 2017 23:21:44 +0000 (19:21 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Mon, 16 Oct 2017 23:20:24 +0000 (19:20 -0400)]
Fixed valgrind issue
Tianfang Yang [Mon, 16 Oct 2017 23:16:30 +0000 (19:16 -0400)]
Fixed valgrind issue
Anatol Belski [Mon, 16 Oct 2017 16:06:38 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Move to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:05:56 +0000 (18:05 +0200)]
Move to next binary SDK version for AppVeyor
Dmitry Stogov [Mon, 16 Oct 2017 16:02:07 +0000 (19:02 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:00:12 +0000 (19:00 +0300)]
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Christoph M. Becker [Mon, 16 Oct 2017 09:11:34 +0000 (11:11 +0200)]
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
Jakub Zelenka [Sun, 15 Oct 2017 19:31:25 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 15 Oct 2017 19:25:58 +0000 (20:25 +0100)]
Properly fix #75363 and address some other leaks with cert
Christoph M. Becker [Sun, 15 Oct 2017 11:58:20 +0000 (13:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
Jelle van der Waa [Mon, 9 Oct 2017 18:35:53 +0000 (20:35 +0200)]
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)
enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.
Christoph M. Becker [Sun, 15 Oct 2017 11:21:37 +0000 (13:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75365 (Enchant still reports version 1.1.0)
Christoph M. Becker [Thu, 12 Oct 2017 13:37:47 +0000 (15:37 +0200)]
Fixed bug #75365 (Enchant still reports version 1.1.0)
Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.
Xinchen Hui [Sun, 15 Oct 2017 02:29:10 +0000 (10:29 +0800)]
Update NEWS
Xinchen Hui [Sun, 15 Oct 2017 02:28:46 +0000 (10:28 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
Xinchen Hui [Sun, 15 Oct 2017 02:28:28 +0000 (10:28 +0800)]
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:23 +0000 (13:56 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:06 +0000 (13:56 +0300)]
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]
Fixed bug #75363 (openssl_x509_parse leaks memory)
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