]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 5 Dec 2017 07:42:25 +0000 (08:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Tue, 5 Dec 2017 07:42:02 +0000 (08:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Tue, 5 Dec 2017 07:41:24 +0000 (08:41 +0100)]
[ci skip] update NEWS
Dmitry Stogov [Mon, 4 Dec 2017 14:22:28 +0000 (17:22 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75608 ("Narrowing occurred during type inference" error)
Dmitry Stogov [Mon, 4 Dec 2017 14:22:06 +0000 (17:22 +0300)]
Fixed bug #75608 ("Narrowing occurred during type inference" error)
Anatol Belski [Mon, 4 Dec 2017 13:16:45 +0000 (14:16 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Use dtor unconditionally in error case
Anatol Belski [Mon, 4 Dec 2017 13:16:23 +0000 (14:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use dtor unconditionally in error case
Anatol Belski [Mon, 4 Dec 2017 13:11:40 +0000 (14:11 +0100)]
Use dtor unconditionally in error case
Anatol Belski [Mon, 4 Dec 2017 10:52:33 +0000 (11:52 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Anatol Belski [Mon, 4 Dec 2017 10:52:09 +0000 (11:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Xinchen Hui [Wed, 29 Nov 2017 06:46:21 +0000 (14:46 +0800)]
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
(cherry picked from commit
3b9ba7b6bd9e24bdbeca8e8e3f24cee2fccc51d8 )
Anatol Belski [Sun, 3 Dec 2017 11:28:41 +0000 (12:28 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix compat with libcurl 7.56.1+ and file:// wrapper
Anatol Belski [Sun, 3 Dec 2017 11:23:25 +0000 (12:23 +0100)]
Fix compat with libcurl 7.56.1+ and file:// wrapper
Since 7.52.x libcurl file:// scheme was implemented in a way described
in https://tools.ietf.org/html/draft-ietf-appsawg-file-scheme-16 . The
draft is still not accepted and the change contained a BC breach with
win32 path handling. It was reported upstream and 7.52.x fixed it, but
the BC breaching behavior was reintroduced in 7.56.1. Thus, it is better
to handle this on the PHP side.
Nikita Popov [Sat, 2 Dec 2017 17:11:17 +0000 (18:11 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 2 Dec 2017 17:11:03 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andy Postnikov [Sat, 10 Dec 2016 20:51:17 +0000 (23:51 +0300)]
Fix ZEND_SIGNED_MULTIPLY_LONG for AArch64
Register operands are required in this context.
This is a backport of
8c8679207ae5ada8751288e75b78c928a4d34d1d
to PHP 7.0+. The current code caused incorrect behavior on AArch64
when compiling with clang.
Anatol Belski [Fri, 1 Dec 2017 15:03:09 +0000 (16:03 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Consider Xdebug for tmi ini generation, too
Anatol Belski [Fri, 1 Dec 2017 15:02:38 +0000 (16:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Consider Xdebug for tmi ini generation, too
Anatol Belski [Fri, 1 Dec 2017 15:01:34 +0000 (16:01 +0100)]
Consider Xdebug for tmi ini generation, too
Dmitry Stogov [Fri, 1 Dec 2017 14:00:51 +0000 (17:00 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Set trailing zero
Dmitry Stogov [Fri, 1 Dec 2017 14:00:42 +0000 (17:00 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Set trailing zero
Dmitry Stogov [Fri, 1 Dec 2017 14:00:11 +0000 (17:00 +0300)]
Set trailing zero
Anatol Belski [Thu, 30 Nov 2017 12:21:04 +0000 (13:21 +0100)]
Revert "Fix macro redefinition warnings"
This reverts commit
23d2bd374838897ec97f9994e70856686a89f132 .
Anatol Belski [Thu, 30 Nov 2017 11:40:52 +0000 (12:40 +0100)]
Fix macro redefinition warnings
The corresponding implementations are available from APR.
Christoph M. Becker [Wed, 29 Nov 2017 15:59:17 +0000 (16:59 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Define floorf if system doesn't have it (follow up for
22c48761 )
Christoph M. Becker [Wed, 29 Nov 2017 15:53:11 +0000 (16:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Define floorf if system doesn't have it (follow up for
22c48761 )
Lior Kaplan [Wed, 29 Nov 2017 11:45:21 +0000 (13:45 +0200)]
Define floorf if system doesn't have it (follow up for
22c48761 )
floorf is checked in config.m4
Frank Denis [Wed, 29 Nov 2017 12:19:18 +0000 (13:19 +0100)]
Revert "Revert "ext/sodium: pwhash: do not warn on low parameters""
This reverts commit
a1845b7fdb5916b0951146ca18bb67ca83854733 .
Revert "Revert "ext/sodium: throw exceptions instead of errors""
This reverts commit
31d221f9c72f0d0322c84907c5d89a4464667244 .
Anatol Belski [Wed, 29 Nov 2017 08:31:29 +0000 (09:31 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:31:14 +0000 (09:31 +0100)]
[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:28:21 +0000 (09:28 +0100)]
[ci skip] update NEWS
Move entry to proper section
Xinchen Hui [Wed, 29 Nov 2017 06:47:26 +0000 (14:47 +0800)]
Update NEWS
Xinchen Hui [Wed, 29 Nov 2017 06:46:44 +0000 (14:46 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Xinchen Hui [Wed, 29 Nov 2017 06:46:21 +0000 (14:46 +0800)]
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Frank Denis [Wed, 29 Nov 2017 00:22:59 +0000 (01:22 +0100)]
Revert "ext/sodium: pwhash: do not warn on low parameters"
This reverts commit
c219991c77e4c68f7d62963e18a1da778de0bbe0 .
Nikita Popov [Tue, 28 Nov 2017 22:37:05 +0000 (23:37 +0100)]
Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2
Nikita Popov [Tue, 28 Nov 2017 22:34:00 +0000 (23:34 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
johnstevenson [Thu, 16 Nov 2017 17:56:32 +0000 (17:56 +0000)]
Fixed #73124: php_ini_scanned_files()
Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.
Frank Denis [Tue, 28 Nov 2017 22:30:21 +0000 (23:30 +0100)]
Revert "ext/sodium: throw exceptions instead of errors"
This reverts commit
c05cbd1e775fa69ed9939796a908390f2bfb4459 .
Anatol Belski [Tue, 28 Nov 2017 19:34:44 +0000 (20:34 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Follow up on bug #75574 for FCGI side
Anatol Belski [Tue, 28 Nov 2017 19:31:48 +0000 (20:31 +0100)]
Follow up on bug #75574 for FCGI side
Remi Collet [Tue, 28 Nov 2017 17:00:36 +0000 (18:00 +0100)]
NEWS
Remi Collet [Tue, 28 Nov 2017 17:00:21 +0000 (18:00 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 17:00:07 +0000 (18:00 +0100)]
NEWS
Remi Collet [Tue, 28 Nov 2017 16:59:36 +0000 (17:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 16:59:16 +0000 (17:59 +0100)]
NEWS
Remi Collet [Mon, 27 Nov 2017 16:06:57 +0000 (17:06 +0100)]
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
Remi Collet [Tue, 28 Nov 2017 16:43:15 +0000 (17:43 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
better fix for #75514
Remi Collet [Tue, 28 Nov 2017 16:42:43 +0000 (17:42 +0100)]
better fix for #75514
Frank Denis [Tue, 28 Nov 2017 12:56:46 +0000 (13:56 +0100)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:php-src:
[ci skip] update NEWS
[ci skip] update NEWS
Fixed bug #73830 Directory does not exist.
Frank Denis [Tue, 28 Nov 2017 12:56:11 +0000 (13:56 +0100)]
ext/sodium: throw exceptions instead of errors
Anatol Belski [Tue, 28 Nov 2017 11:46:39 +0000 (12:46 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:46:03 +0000 (12:46 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:45:30 +0000 (12:45 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:42:40 +0000 (12:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #73830 Directory does not exist.
Anatol Belski [Tue, 28 Nov 2017 11:41:49 +0000 (12:41 +0100)]
Fixed bug #73830 Directory does not exist.
Frank Denis [Tue, 28 Nov 2017 10:24:49 +0000 (11:24 +0100)]
ext/sodium: pwhash: do not warn on low parameters
but raise an explicit error if these are too low
Remi Collet [Tue, 28 Nov 2017 07:00:45 +0000 (08:00 +0100)]
drop -dev from Zend version
Xinchen Hui [Tue, 28 Nov 2017 05:16:39 +0000 (13:16 +0800)]
Update NEWS
Xinchen Hui [Tue, 28 Nov 2017 05:16:22 +0000 (13:16 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWs (added bug entry)
Xinchen Hui [Tue, 28 Nov 2017 05:15:54 +0000 (13:15 +0800)]
Update NEWs (added bug entry)
Anatol Belski [Mon, 27 Nov 2017 20:18:54 +0000 (21:18 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix allocation
Fix memory leak
Anatol Belski [Mon, 27 Nov 2017 20:18:08 +0000 (21:18 +0100)]
Fix allocation
Anatol Belski [Mon, 27 Nov 2017 19:24:30 +0000 (20:24 +0100)]
Fix memory leak
Anatol Belski [Mon, 27 Nov 2017 17:50:05 +0000 (18:50 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
Anatol Belski [Mon, 27 Nov 2017 17:49:02 +0000 (18:49 +0100)]
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
Remi Collet [Mon, 27 Nov 2017 11:49:28 +0000 (12:49 +0100)]
Prepare NEWS file for release
- set release date
- merge all alpha/beta/RC entries
- clean entries already in 7.1
Anatol Belski [Mon, 27 Nov 2017 11:33:23 +0000 (12:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix normalized path length calculation and error handling
Anatol Belski [Mon, 27 Nov 2017 11:32:19 +0000 (12:32 +0100)]
Fix normalized path length calculation and error handling
Dmitry Stogov [Mon, 27 Nov 2017 07:16:46 +0000 (10:16 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug in type inference
Dmitry Stogov [Mon, 27 Nov 2017 07:16:16 +0000 (10:16 +0300)]
Fixed bug in type inference
Xinchen Hui [Mon, 27 Nov 2017 04:03:37 +0000 (12:03 +0800)]
Improved fix
Xinchen Hui [Fri, 24 Nov 2017 16:54:15 +0000 (00:54 +0800)]
Fixed bug #75556 (Invalid opcode 138/1/1)
Remi Collet [Thu, 23 Nov 2017 10:08:53 +0000 (11:08 +0100)]
add 7.1 NEW entries
Dmitry Stogov [Wed, 22 Nov 2017 13:30:57 +0000 (16:30 +0300)]
typo
krakjoe [Wed, 22 Nov 2017 04:49:43 +0000 (04:49 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Check for binary_location allocation failure
krakjoe [Wed, 22 Nov 2017 04:49:34 +0000 (04:49 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Check for binary_location allocation failure
Sebastian Ramadan [Wed, 15 Nov 2017 02:24:28 +0000 (13:24 +1100)]
Check for binary_location allocation failure
krakjoe [Wed, 22 Nov 2017 04:32:24 +0000 (04:32 +0000)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #75409
krakjoe [Wed, 22 Nov 2017 04:30:59 +0000 (04:30 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75409
Scott [Wed, 22 Nov 2017 03:02:07 +0000 (22:02 -0500)]
Fix bug #75409
Anatol Belski [Tue, 21 Nov 2017 21:24:54 +0000 (22:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:24:32 +0000 (22:24 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:23:31 +0000 (22:23 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:22:59 +0000 (22:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:22:21 +0000 (22:22 +0100)]
[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 19:11:21 +0000 (20:11 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed #75539 and #74183 - preg_last_error not returning error code after error
Anatol Belski [Tue, 21 Nov 2017 19:10:49 +0000 (20:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #75539 and #74183 - preg_last_error not returning error code after error
Nester [Tue, 21 Nov 2017 11:42:22 +0000 (11:42 +0000)]
Fixed #75539 and #74183 - preg_last_error not returning error code after error
Remi Collet [Mon, 20 Nov 2017 08:42:58 +0000 (09:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Better fix bug #75540 Segfault with libzip 1.3.1 - only 1.3.1 is affected - fix use after free
Remi Collet [Mon, 20 Nov 2017 08:42:47 +0000 (09:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Better fix bug #75540 Segfault with libzip 1.3.1 - only 1.3.1 is affected - fix use after free
Remi Collet [Mon, 20 Nov 2017 08:42:20 +0000 (09:42 +0100)]
Better fix bug #75540 Segfault with libzip 1.3.1
- only 1.3.1 is affected
- fix use after free
Remi Collet [Mon, 20 Nov 2017 07:51:42 +0000 (08:51 +0100)]
NEWS
Remi Collet [Mon, 20 Nov 2017 07:51:29 +0000 (08:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
NEWS
fix bug #75540 Segfault with libzip 1.3.1
Remi Collet [Mon, 20 Nov 2017 07:51:13 +0000 (08:51 +0100)]
NEWS
Remi Collet [Mon, 20 Nov 2017 07:50:51 +0000 (08:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
fix bug #75540 Segfault with libzip 1.3.1
Remi Collet [Mon, 20 Nov 2017 07:50:33 +0000 (08:50 +0100)]
NEWS
Remi Collet [Mon, 20 Nov 2017 07:49:46 +0000 (08:49 +0100)]
fix bug #75540 Segfault with libzip 1.3.1
Nikita Popov [Fri, 17 Nov 2017 22:21:54 +0000 (23:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 17 Nov 2017 22:20:46 +0000 (23:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1