]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 27 Mar 2019 12:02:28 +0000 (13:02 +0100)]
Fix lineno for more inheritance errors
And also include explicit linenos in tests.
Nikita Popov [Wed, 27 Mar 2019 11:43:23 +0000 (12:43 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 27 Mar 2019 11:42:35 +0000 (12:42 +0100)]
Make line numbers for inheritance errors more precise
Use the line of the conflicting child method, rather than either the
first or last line of the class.
Joe Watkins [Wed, 27 Mar 2019 09:39:04 +0000 (10:39 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Consider phpdbg as cli
Joe Watkins [Wed, 27 Mar 2019 09:38:56 +0000 (10:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Consider phpdbg as cli
Joe Watkins [Wed, 27 Mar 2019 09:38:45 +0000 (10:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Consider phpdbg as cli
Samuele Kaplun [Tue, 18 Sep 2018 12:49:36 +0000 (14:49 +0200)]
Consider phpdbg as cli
* When configuring extensions, considers the PHPDBG SAPI as CLI thus
allowing e.g. to have the pcntl extension available within PHPDBG.
Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
Joe Watkins [Wed, 27 Mar 2019 09:09:34 +0000 (10:09 +0100)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Wed, 27 Mar 2019 09:09:10 +0000 (10:09 +0100)]
Merge branch 'master' of git://github.com/php/php-src
Joe Watkins [Wed, 27 Mar 2019 09:04:47 +0000 (10:04 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77805 phpdbg build fails when readline is shared
Joe Watkins [Wed, 27 Mar 2019 09:04:18 +0000 (10:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77805 phpdbg build fails when readline is shared
Joe Watkins [Wed, 27 Mar 2019 09:03:50 +0000 (10:03 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77805 phpdbg build fails when readline is shared
Joe Watkins [Wed, 27 Mar 2019 08:58:40 +0000 (09:58 +0100)]
Fix #77805 phpdbg build fails when readline is shared
Sara Golemon [Wed, 27 Mar 2019 04:37:31 +0000 (00:37 -0400)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Validate interoperability between libsodium and libargon for argon2i(d) hashing
Increase default time cost for argon2 password hashing
Sara Golemon [Wed, 27 Mar 2019 04:07:34 +0000 (00:07 -0400)]
Validate interoperability between libsodium and libargon for argon2i(d) hashing
Sara Golemon [Wed, 27 Mar 2019 04:07:55 +0000 (00:07 -0400)]
Increase default time cost for argon2 password hashing
Joe Watkins [Tue, 26 Mar 2019 23:02:52 +0000 (00:02 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 23:02:43 +0000 (00:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 23:02:31 +0000 (00:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 23:02:15 +0000 (00:02 +0100)]
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 22:07:06 +0000 (23:07 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77800 phpdbg segfaults on conditional breakpoints
Joe Watkins [Tue, 26 Mar 2019 22:06:34 +0000 (23:06 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77800 phpdbg segfaults on conditional breakpoints
Joe Watkins [Tue, 26 Mar 2019 22:06:00 +0000 (23:06 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77800 phpdbg segfaults on conditional breakpoints
Joe Watkins [Tue, 26 Mar 2019 22:05:06 +0000 (23:05 +0100)]
Fix #77800 phpdbg segfaults on conditional breakpoints
Peter Kokot [Tue, 26 Mar 2019 21:31:24 +0000 (22:31 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add minimum required PHP version to run-tests.php
Peter Kokot [Mon, 25 Mar 2019 19:50:14 +0000 (20:50 +0100)]
Add minimum required PHP version to run-tests.php
This integrates a simple minimum PHP version info in the tool and to
also define the minimum version that the tool syntax should support.
Joe Watkins [Tue, 26 Mar 2019 17:28:18 +0000 (18:28 +0100)]
remove last enable-maintainer-zts mention from source
Nikita Popov [Tue, 26 Mar 2019 14:48:02 +0000 (15:48 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Mar 2019 14:46:09 +0000 (15:46 +0100)]
Add zend_error_at API that accepts a filename and lineno
Use this for the opcache preloading warnings, as an example usage.
Ivan Enderlin [Tue, 26 Mar 2019 13:14:29 +0000 (14:14 +0100)]
Fix typos in the documentation
Nikita Popov [Tue, 26 Mar 2019 09:11:47 +0000 (10:11 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Mar 2019 14:46:43 +0000 (15:46 +0100)]
Make PCRE cache per-request on CLI
There will only be one request on the CLI SAPI, so there is no
advantage to having a persistent PCRE cache. Using a non-persistent
cache allows us to use arbitrary strings as cache keys.
Peter Kokot [Mon, 25 Mar 2019 22:00:50 +0000 (23:00 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Join contributing and patches docs
Peter Kokot [Sat, 23 Mar 2019 18:05:37 +0000 (19:05 +0100)]
[ci skip] Join contributing and patches docs
This joins two similar contextual information together in the main
CONTRIBUTING.md file.
Additionally:
- http links updated to https where possible
- sentences and sections refactored more so they make some sence. GitHub
pull requests are preferred way for contributing code.
- reorder paragraphs and contextual info
- s/mail list/mailing list
- PHP internals refactorings
- use canonical https://www.php.net
Peter Kokot [Mon, 25 Mar 2019 20:59:04 +0000 (21:59 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Peter Kokot [Mon, 25 Mar 2019 20:57:39 +0000 (21:57 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Peter Kokot [Mon, 25 Mar 2019 20:57:20 +0000 (21:57 +0100)]
[ci skip] Update NEWS
Peter Kokot [Mon, 25 Mar 2019 20:56:39 +0000 (21:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Peter Kokot [Mon, 25 Mar 2019 20:46:41 +0000 (21:46 +0100)]
[ci skip] Update NEWS
Niklas Keller [Sun, 24 Mar 2019 18:39:25 +0000 (19:39 +0100)]
Fix #77794: Incorrect Date header format in built-in server
- Fix the date format to be compliant with https://tools.ietf.org/html/rfc7231#section-7.1.1.2
- Fix date format length and use GMT time
- Previously, local time was used instead of GMT.
- Remove extra whitespace
- Simplify string appends in php_cli_server.c
Dmitry Stogov [Mon, 25 Mar 2019 18:45:39 +0000 (21:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Regenerate parser
Dmitry Stogov [Mon, 25 Mar 2019 18:45:10 +0000 (21:45 +0300)]
Regenerate parser
Derick Rethans [Mon, 25 Mar 2019 16:02:40 +0000 (16:02 +0000)]
Update README.RELEASE_PROCESS
Nikita Popov [Mon, 25 Mar 2019 16:46:33 +0000 (17:46 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Mar 2019 16:46:28 +0000 (17:46 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 25 Mar 2019 16:45:03 +0000 (17:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Vlad Temian [Tue, 19 Mar 2019 16:36:45 +0000 (18:36 +0200)]
Fix bug #77680: Correctly implement recursive mkdir on FTP stream
If the root directory was missing, an extra CWD without arguments was
made. Also, the MKD contained an empty string.
Now the CWD will use / and MKDs will be issued starting from the root
directory.
Nikita Popov [Mon, 25 Mar 2019 16:36:38 +0000 (17:36 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Mar 2019 16:34:29 +0000 (17:34 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 25 Mar 2019 16:33:17 +0000 (17:33 +0100)]
Fixed bug #77793
By making sure that we always first increment the refcount of the
new value before we destroy the old one.
Nikita Popov [Mon, 25 Mar 2019 15:43:50 +0000 (16:43 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Mar 2019 15:43:33 +0000 (16:43 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 25 Mar 2019 15:42:48 +0000 (16:42 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 25 Mar 2019 15:41:21 +0000 (16:41 +0100)]
Fixed bug #72175
Make sure we don't close the connection we're trying to reuse...
Nikita Popov [Mon, 25 Mar 2019 13:22:25 +0000 (14:22 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 25 Mar 2019 13:15:26 +0000 (14:15 +0100)]
Don't use parallel testing with -j1
Nikita Popov [Mon, 25 Mar 2019 13:13:10 +0000 (14:13 +0100)]
Drop lightning for concurrent worker count
This looked rather awkward even on terminals that have full unicode
support.
Nikita Popov [Mon, 25 Mar 2019 12:58:56 +0000 (13:58 +0100)]
Merge branch 'PHP-7.4'
Tyson Andre [Sat, 23 Mar 2019 20:47:10 +0000 (16:47 -0400)]
Make run-tests.php compatible with php 7.0-7.2
Motivation:
As an extension author, I want to speed up running tests in php <=7.3,
both locally and in CI (e.g. with valgrind).
This can be done by manually copying php 7.4's run-tests.php script
to replace the one generated by `phpize`
- list() doesn't work in php 7.0
- negative string offset doesn't work in php 7.2
If run-tests.php can be copied from php-src without any manual patches,
that would be the easiest.
Related to #2822 - I didn't see any discussion for/against compatibility
with older php versions
Joe Watkins [Mon, 25 Mar 2019 07:00:57 +0000 (08:00 +0100)]
Merge branch 'master' of git://github.com/php/php-src
Joe Watkins [Sat, 23 Mar 2019 07:15:53 +0000 (08:15 +0100)]
TSRM cleanup for PHP8
Peter Kokot [Sun, 24 Mar 2019 01:13:20 +0000 (02:13 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enhance Autoconf version checking
Peter Kokot [Sun, 17 Mar 2019 22:55:37 +0000 (23:55 +0100)]
Enhance Autoconf version checking
With this required Autoconf version is now defined only on two places:
- configure.ac
- scripts/phpize.m4
and additionally:
- Script can be run from other locations
- Synced CS and portability a bit
Peter Kokot [Sun, 24 Mar 2019 00:57:53 +0000 (01:57 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Move CREDITS from root to README
Peter Kokot [Sat, 23 Mar 2019 16:06:56 +0000 (17:06 +0100)]
[ci skip] Move CREDITS from root to README
Peter Kokot [Sun, 24 Mar 2019 00:54:46 +0000 (01:54 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tokenizer_data_gen.sh for non-posix bison
Guilliam Xavier [Sat, 23 Mar 2019 14:41:46 +0000 (15:41 +0100)]
Fix tokenizer_data_gen.sh for non-posix bison
And run it to update tokenizer_data.c after recent changes in
zend_language_parser.y that reordered some tokens
Peter Kokot [Sat, 23 Mar 2019 22:26:08 +0000 (23:26 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove enable-wddx from Travis compile as it WDDX has been unbundled as of PHP 7.4
George Peter Banyard [Sat, 23 Mar 2019 21:23:05 +0000 (22:23 +0100)]
Remove enable-wddx from Travis compile as it WDDX has been unbundled as of PHP 7.4
Peter Kokot [Sat, 23 Mar 2019 20:11:32 +0000 (21:11 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Remove text editor modelines
Peter Kokot [Sat, 23 Mar 2019 20:09:38 +0000 (21:09 +0100)]
[ci skip] Remove text editor modelines
These were already removed
92ac598aabd336593a47ed3959f1031674b763e6
and this fixes some leftovers. These files don't really need these
settings.
Joe Watkins [Sat, 23 Mar 2019 08:49:39 +0000 (09:49 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix bug #76801: phpdbg too many open files error
Joe Watkins [Sat, 23 Mar 2019 08:49:03 +0000 (09:49 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix bug #76801: phpdbg too many open files error
Joe Watkins [Sat, 23 Mar 2019 08:48:04 +0000 (09:48 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix bug #76801: phpdbg too many open files error
Alessandro Chitolina [Tue, 19 Mar 2019 16:34:34 +0000 (17:34 +0100)]
fix bug #76801: phpdbg too many open files error
Joe Watkins [Fri, 22 Mar 2019 09:10:01 +0000 (10:10 +0100)]
For consistency with Windows, and because ZTS is not experimental or a "maintainer" feature, this commits renames --enable-maintainer-zts to --enable-zts in the autotools build, and related documentation
Remi Collet [Fri, 22 Mar 2019 14:32:07 +0000 (15:32 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ensure pcre.jit=1 for this test
Remi Collet [Fri, 22 Mar 2019 14:31:53 +0000 (15:31 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
ensure pcre.jit=1 for this test
Remi Collet [Fri, 22 Mar 2019 14:31:36 +0000 (15:31 +0100)]
ensure pcre.jit=1 for this test
Remi Collet [Fri, 22 Mar 2019 14:02:26 +0000 (15:02 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ensure pcre.jit=1 for these tests
Remi Collet [Fri, 22 Mar 2019 14:02:13 +0000 (15:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
ensure pcre.jit=1 for these tests
Remi Collet [Fri, 22 Mar 2019 14:01:49 +0000 (15:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ensure pcre.jit=1 for these tests
Remi Collet [Fri, 22 Mar 2019 14:00:31 +0000 (15:00 +0100)]
ensure pcre.jit=1 for these tests
Nikita Popov [Fri, 22 Mar 2019 12:07:15 +0000 (13:07 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Mar 2019 12:07:11 +0000 (13:07 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Mar 2019 12:07:00 +0000 (13:07 +0100)]
Fixed bug #77773
Nikita Popov [Fri, 22 Mar 2019 11:41:39 +0000 (12:41 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Mar 2019 11:41:34 +0000 (12:41 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 22 Mar 2019 11:40:21 +0000 (12:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Mar 2019 11:39:27 +0000 (12:39 +0100)]
Fixed bug #77772
Nikita Popov [Fri, 22 Mar 2019 09:43:21 +0000 (10:43 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 22 Jan 2019 16:47:16 +0000 (17:47 +0100)]
Implement new custom object serialization mechanism
RFC: https://wiki.php.net/rfc/custom_object_serialization
Nikita Popov [Fri, 22 Mar 2019 09:30:15 +0000 (10:30 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 22 Mar 2019 09:29:18 +0000 (10:29 +0100)]
Remove HAVE_PCRE/HAVE_BUNDLED_PCRE checks
PCRE is always available.
rjhdby [Mon, 11 Mar 2019 11:55:25 +0000 (14:55 +0300)]
Make zend_hash_sort() return void
This function always succeeds, so remove the success indicator
return value.
Nikita Popov [Fri, 22 Mar 2019 08:48:26 +0000 (09:48 +0100)]
Merge branch 'PHP-7.4'
rjhdby [Mon, 18 Mar 2019 14:17:29 +0000 (17:17 +0300)]
Deduplicate code in zend_builtin_functions.c
Nikita Popov [Thu, 21 Mar 2019 15:28:19 +0000 (16:28 +0100)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 15 Mar 2019 11:36:49 +0000 (12:36 +0100)]
Switch to bison location tracking
Locations for AST nodes are now tracked with the help of bison
location tracking. This is more accurate than what we currently do
and easier to extend with more information.
A zend_ast_loc structure is introduced, which is used for the location
stack. Currently it only holds the start lineno, but can be extended
to also hold end lineno and offset/column information in the future.
All AST constructors now accept a zend_ast_loc* as first argument, and
will use it to determine their lineno. Previously this used either the
CG(zend_lineno), or the smallest AST lineno of child nodes.
On the parser side, the location structure for a whole rule can be
obtained using the &@$ character salad.