]>
granicus.if.org Git - php/log
Rasmus Lerdorf [Tue, 21 May 2019 21:47:28 +0000 (14:47 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:46:44 +0000 (14:46 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:44:11 +0000 (14:44 -0700)]
Fix precedence issue causing sub-second timeouts to be 0 in
curl_multi_select
Nikita Popov [Tue, 21 May 2019 15:35:33 +0000 (17:35 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:35:28 +0000 (17:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 15:35:03 +0000 (17:35 +0200)]
Don't evaluate functions with partial array arguments
Nikita Popov [Tue, 21 May 2019 15:18:01 +0000 (17:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:17:30 +0000 (17:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 15:15:07 +0000 (17:15 +0200)]
Fix null check in sccp add_array_elem chain handling
We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.
Nikita Popov [Tue, 21 May 2019 15:04:17 +0000 (17:04 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:03:52 +0000 (17:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 14:59:27 +0000 (16:59 +0200)]
Fix partial array handling in FE_RESET edge feasibility
Nikita Popov [Tue, 21 May 2019 14:51:35 +0000 (16:51 +0200)]
Handle partial arrays in zend_is_true() checks
Nikita Popov [Tue, 21 May 2019 14:43:41 +0000 (16:43 +0200)]
Extract ct_eval_binary_op()
And use it in more places, though some of them are currently not
reachable by partial arrays to the best of my knowledge.
Nikita Popov [Tue, 21 May 2019 14:40:18 +0000 (16:40 +0200)]
Improve SCCP debug code
In particular properly dump partial arrays when tracing execution.
Remi Collet [Tue, 21 May 2019 14:15:08 +0000 (16:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
sodium: fix shared build
enchant: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:42 +0000 (16:14 +0200)]
sodium: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:12 +0000 (16:14 +0200)]
enchant: fix shared build
Christoph M. Becker [Tue, 21 May 2019 12:34:55 +0000 (14:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix ASLR related invalid opline handler issues
Christoph M. Becker [Mon, 20 May 2019 13:59:54 +0000 (15:59 +0200)]
Fix ASLR related invalid opline handler issues
Opcache stores `opline->handler`s in shared memory. These pointers are
invalid, if the main PHP DLL is loaded at another base address due to
ASLR. We therefore store the address of `execute_ex` in the mmap base
file, and check on startup whether it matches its current address. If
not, we fall back on the file cache if enabled, and bail out otherwise.
This still does not address cases where the opline handler is located
inside of another DLL (e.g. for some profilers, debuggers), but there
seems to be no general solution for now.
Remi Collet [Tue, 21 May 2019 12:26:08 +0000 (14:26 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix typo breaking shared build
Remi Collet [Tue, 21 May 2019 12:25:55 +0000 (14:25 +0200)]
fix typo breaking shared build
Christoph M. Becker [Tue, 21 May 2019 09:19:35 +0000 (11:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:19:05 +0000 (11:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:18:32 +0000 (11:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:17:28 +0000 (11:17 +0200)]
Prevent test case failure
If opcache.log_verbosity_level is greater than 1, opcache will raise
warnings, which will be written to stderr in the default case. These
warnings are actually to be expected, but would break the test, so we
make sure that the log_verbosity_level is 1 when running this test.
Nikita Popov [Tue, 21 May 2019 08:05:12 +0000 (10:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 08:05:03 +0000 (10:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 08:04:51 +0000 (10:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Vincent JARDIN [Tue, 23 Apr 2019 21:10:38 +0000 (23:10 +0200)]
Support content_type stream context option in soap
Allows overriding the HTTP header using the HTTP context:
$client = new SoapClient('http://url.wsdl&v=latest', [
'stream_context' => stream_context_create([
'http' => [
'content_type' => 'foobarX',
],
]),
]);
This is a backport of
c55af3c65ac116bbd935bd3d695869d88056c49c
to the PHP 7.2 branch.
Christoph M. Becker [Tue, 21 May 2019 07:03:51 +0000 (09:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
use {TMP} placeholder in phpt tests
Christoph M. Becker [Tue, 21 May 2019 07:03:20 +0000 (09:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
use {TMP} placeholder in phpt tests
Christoph M. Becker [Tue, 21 May 2019 07:03:01 +0000 (09:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
use {TMP} placeholder in phpt tests
Holly Li (WIPRO LIMITED) [Tue, 21 May 2019 05:53:08 +0000 (07:53 +0200)]
use {TMP} placeholder in phpt tests
Dmitry Stogov [Mon, 20 May 2019 21:08:22 +0000 (00:08 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:08:12 +0000 (00:08 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:08:03 +0000 (00:08 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:07:17 +0000 (00:07 +0300)]
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 15:16:01 +0000 (18:16 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78014 (Preloaded classes may depend on non-preloaded classes due to unresolved consts)
Dmitry Stogov [Mon, 20 May 2019 15:15:38 +0000 (18:15 +0300)]
Fixed bug #78014 (Preloaded classes may depend on non-preloaded classes due to unresolved consts)
Christoph M. Becker [Mon, 20 May 2019 09:11:39 +0000 (11:11 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:11:06 +0000 (11:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:10:20 +0000 (11:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:09:44 +0000 (11:09 +0200)]
Fix test wrt. opcache.error_log
Since the test expects log messages to be written to stderr, we have to
make sure that opcache.error_log is set correctly when running the
test.
Joe Watkins [Mon, 20 May 2019 04:07:03 +0000 (06:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Rename *.l files to *.re"
Joe Watkins [Mon, 20 May 2019 04:06:38 +0000 (06:06 +0200)]
Revert "Rename *.l files to *.re"
This reverts commit
969047749d33bb88a0573aa91a57e2070335111a .
Gabriel Caruso [Sun, 19 May 2019 11:47:53 +0000 (08:47 -0300)]
Fix test related to
714d9fc358640069bda5540c2b1136a6241c4c94
The string value in the test array was removed, as the `chr` function
only accepts an integer
Gabriel Caruso [Sun, 19 May 2019 10:25:56 +0000 (07:25 -0300)]
Fix tests related to
714d9fc358640069bda5540c2b1136a6241c4c94
Some changes did not get into master during merge conflits.
Peter Kokot [Sat, 18 May 2019 19:42:45 +0000 (21:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Migrate Coding standards docs to Markdown
Move CODING_STANDARDS to CODING_STANDARDS.md
Peter Kokot [Sat, 18 May 2019 19:39:19 +0000 (21:39 +0200)]
[ci skip] Migrate Coding standards docs to Markdown
Peter Kokot [Sat, 18 May 2019 19:38:42 +0000 (21:38 +0200)]
Move CODING_STANDARDS to CODING_STANDARDS.md
Gabriel Caruso [Sat, 18 May 2019 19:17:06 +0000 (16:17 -0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make chr ZPP failure message consistent with ext/standard
Gabriel Caruso [Wed, 8 May 2019 19:42:02 +0000 (16:42 -0300)]
Make chr ZPP failure message consistent with ext/standard
Peter Kokot [Sat, 18 May 2019 18:39:30 +0000 (20:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Join Zend engine docs-alike files to readme
Peter Kokot [Sat, 18 May 2019 18:39:18 +0000 (20:39 +0200)]
[ci skip] Join Zend engine docs-alike files to readme
Peter Kokot [Sat, 18 May 2019 00:07:04 +0000 (02:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Enhance makedist script
Peter Kokot [Fri, 26 Apr 2019 00:38:53 +0000 (02:38 +0200)]
Enhance makedist script
This enhances the makidst script:
- integrate both snapshot and makedist scripts together
- add help and options
- generated files are created in the php-src repository directly
- other minor enhancemenets such as CS fixes
- functionality moved from the Makefile to only shell script
- Add missed patching of the Zend Parsers to the main build step
- Add all *.tmp files to gitignore
Peter Kokot [Fri, 17 May 2019 21:54:12 +0000 (23:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Rename *.l files to *.re
Peter Kokot [Fri, 17 May 2019 02:19:34 +0000 (04:19 +0200)]
Rename *.l files to *.re
This syncs PHP lexer files to all use *.re extension. The *.re files are
processed with the RE2C tool.
Peter Kokot [Fri, 17 May 2019 21:45:26 +0000 (23:45 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Move copyright/license headers to CONTRIBUTING.md
Peter Kokot [Sat, 27 Apr 2019 20:31:13 +0000 (22:31 +0200)]
Move copyright/license headers to CONTRIBUTING.md
These are more like a general contribution guidelines for the new files
added to the php-src repository.
Peter Kokot [Fri, 17 May 2019 17:39:31 +0000 (19:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add enchant pkg-config notice in UPGRADING
Use PKG_CHECK_MODULES to detect the Enchant library
Peter Kokot [Fri, 17 May 2019 17:39:22 +0000 (19:39 +0200)]
Add enchant pkg-config notice in UPGRADING
Hugh McMaster [Fri, 17 May 2019 11:25:12 +0000 (21:25 +1000)]
Use PKG_CHECK_MODULES to detect the Enchant library
Peter Kokot [Fri, 17 May 2019 17:05:16 +0000 (19:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use *.data for tests data files
Peter Kokot [Fri, 17 May 2019 17:04:43 +0000 (19:04 +0200)]
Use *.data for tests data files
Christoph M. Becker [Fri, 17 May 2019 11:33:23 +0000 (13:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78025: segfault when accessing properties of DOMDocumentType
Christoph M. Becker [Fri, 17 May 2019 11:32:53 +0000 (13:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78025: segfault when accessing properties of DOMDocumentType
Christoph M. Becker [Fri, 17 May 2019 11:31:52 +0000 (13:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78025: segfault when accessing properties of DOMDocumentType
Christoph M. Becker [Fri, 17 May 2019 11:31:18 +0000 (13:31 +0200)]
Fix #78025: segfault when accessing properties of DOMDocumentType
Instead of following the NULL pointer, we return an empty string.
Peter Kokot [Fri, 17 May 2019 02:00:04 +0000 (04:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use *.data for fixture files
Peter Kokot [Fri, 17 May 2019 01:59:23 +0000 (03:59 +0200)]
Use *.data for fixture files
Peter Kokot [Fri, 17 May 2019 01:18:13 +0000 (03:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update UPGRADING about LiteSpeed
Rename configure --with-litespeed to --enable-litespeed
Peter Kokot [Fri, 17 May 2019 01:18:02 +0000 (03:18 +0200)]
Update UPGRADING about LiteSpeed
Peter Kokot [Sat, 11 May 2019 03:19:28 +0000 (05:19 +0200)]
Rename configure --with-litespeed to --enable-litespeed
This syncs the configuration option of the litespeed module to be
compliant with the approach of:
--with-foo (when something additional needs to be installed such as
libfoo)
--enable-foo (when extension/sapi doesn't have dependencies on some
library)
Bob Weinand [Thu, 16 May 2019 16:37:42 +0000 (18:37 +0200)]
Merge branch 'concatenation_precedence'
Bob Weinand [Thu, 16 May 2019 16:37:05 +0000 (18:37 +0200)]
Merge branch 'PHP-7.4'
Bob Weinand [Thu, 16 May 2019 16:31:28 +0000 (18:31 +0200)]
Merge branch 'deprecate_concat_add_sub' into PHP-8.4
Peter Kokot [Thu, 16 May 2019 05:43:52 +0000 (07:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Rename *.tif to *.tiff for consistency
Peter Kokot [Thu, 16 May 2019 05:41:45 +0000 (07:41 +0200)]
Rename *.tif to *.tiff for consistency
There really isn't any practical difference between these two, but repo
currently uses *.tiff files more than 8.3 variant filenames of *.tif.
Also these aren't part of the test.
Nikita Popov [Wed, 15 May 2019 12:36:53 +0000 (14:36 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 15 May 2019 12:36:45 +0000 (14:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 15 May 2019 12:35:31 +0000 (14:35 +0200)]
Fixed bug #78015
Don't try to evaluate various operations with partial array operands.
We could evaluate some of these, but let's be conservative for now...
Nikita Popov [Wed, 15 May 2019 10:49:50 +0000 (12:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 15 May 2019 10:49:03 +0000 (12:49 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 15 May 2019 10:48:25 +0000 (12:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 15 May 2019 10:46:23 +0000 (12:46 +0200)]
Fixed bug #76980
If we perform a class fetch that is not marked as exception safe,
convert exceptions thrown by autoloaders into a fatal error.
Ideally fetching the interfaces would be exception safe, but as it
isn't right now, we must abort at this point.
Christoph M. Becker [Wed, 15 May 2019 09:33:15 +0000 (11:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS regarding re-tagging 7.3.6RC1
Christoph M. Becker [Wed, 15 May 2019 09:32:43 +0000 (11:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS regarding re-tagging 7.3.6RC1
Christoph M. Becker [Wed, 15 May 2019 09:31:53 +0000 (11:31 +0200)]
Update NEWS regarding re-tagging 7.3.6RC1
Dmitry Stogov [Wed, 15 May 2019 08:07:51 +0000 (11:07 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Removed ability to compile PHP without EX(run_time_cache). ZEND_EX_USE_RUN_TIME_CACHE was always defined.
Dmitry Stogov [Wed, 15 May 2019 08:06:26 +0000 (11:06 +0300)]
Removed ability to compile PHP without EX(run_time_cache). ZEND_EX_USE_RUN_TIME_CACHE was always defined.
Sara Golemon [Wed, 15 May 2019 00:24:01 +0000 (20:24 -0400)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump for 7.2.20
Sara Golemon [Wed, 15 May 2019 00:23:41 +0000 (20:23 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump for 7.2.20
Sara Golemon [Wed, 15 May 2019 00:23:25 +0000 (20:23 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.20
Sara Golemon [Wed, 15 May 2019 00:22:00 +0000 (20:22 -0400)]
Bump for 7.2.20
Peter Kokot [Tue, 14 May 2019 22:00:14 +0000 (00:00 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update changelogs
Fix bug #62397 - disable_functions does not work with eval.
Peter Kokot [Tue, 14 May 2019 22:00:01 +0000 (00:00 +0200)]
Update changelogs
Benjamin Eberlei [Sun, 28 Apr 2019 15:30:09 +0000 (17:30 +0200)]
Fix bug #62397 - disable_functions does not work with eval.