]>
granicus.if.org Git - php/log
Anatol Belski [Sat, 10 Nov 2018 21:02:44 +0000 (22:02 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 21:02:24 +0000 (22:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 21:01:49 +0000 (22:01 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 19:07:25 +0000 (20:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fork test with pcre.jit=0
Anatol Belski [Sat, 10 Nov 2018 19:05:56 +0000 (20:05 +0100)]
Fork test with pcre.jit=0
Anatol Belski [Sat, 10 Nov 2018 17:22:44 +0000 (18:22 +0100)]
Rework magic data
Still upstream contains some slower patterns. Those might need to
be patched, if regressions arise.
Anatol Belski [Sat, 10 Nov 2018 11:13:03 +0000 (12:13 +0100)]
Fix regex
Anatol Belski [Sat, 10 Nov 2018 11:12:25 +0000 (12:12 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix regex
Anatol Belski [Sat, 10 Nov 2018 11:11:02 +0000 (12:11 +0100)]
Fix regex
Anatol Belski [Sat, 10 Nov 2018 00:32:35 +0000 (01:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Rework magic data
Anatol Belski [Sat, 10 Nov 2018 00:28:23 +0000 (01:28 +0100)]
Rework magic data
Avoid patching where vanilla data suffices. More precisely, avoid data
using [:space:] posix class in regex, as it is likely to cause performance
regressions.
Anatol Belski [Fri, 9 Nov 2018 23:20:39 +0000 (00:20 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync one more upstream libmagic piece
Anatol Belski [Fri, 9 Nov 2018 23:18:30 +0000 (00:18 +0100)]
Sync one more upstream libmagic piece
Christoph M. Becker [Tue, 6 Nov 2018 10:45:18 +0000 (11:45 +0100)]
[ci skip] Update NEWS wrt. php-7.3.0RC5 tagging
Anatol Belski [Mon, 5 Nov 2018 21:53:45 +0000 (22:53 +0100)]
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:53:19 +0000 (22:53 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:53:01 +0000 (22:53 +0100)]
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:25:31 +0000 (22:25 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:25:04 +0000 (22:25 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:22:49 +0000 (22:22 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 20:29:35 +0000 (21:29 +0100)]
Declare function proto in header
Anatol Belski [Mon, 5 Nov 2018 20:29:06 +0000 (21:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Declare function proto in header
Anatol Belski [Mon, 5 Nov 2018 20:28:04 +0000 (21:28 +0100)]
Declare function proto in header
Christoph M. Becker [Mon, 5 Nov 2018 17:24:39 +0000 (18:24 +0100)]
Fix #76825: Undefined symbols ___cpuid_count
Apparently, the presence of `cpuid.h` is not necessarily sufficient to
guarantee the availability of `__cpuid_count()`. We therefore test for
the latter explicitly.
Remi Collet [Mon, 5 Nov 2018 16:06:40 +0000 (17:06 +0100)]
NEWS
Remi Collet [Mon, 5 Nov 2018 16:05:49 +0000 (17:05 +0100)]
Fix: #77110 undefined symbol zend_string_equal_val in C++ build
Anatol Belski [Mon, 5 Nov 2018 00:15:09 +0000 (01:15 +0100)]
Implement handling for JIT recognition when cross compiling
Anatol Belski [Sun, 4 Nov 2018 15:59:27 +0000 (16:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport
7f5f4601 for 7.2
Anatol Belski [Sun, 4 Nov 2018 15:56:43 +0000 (16:56 +0100)]
Backport
7f5f4601 for 7.2
Christoph M. Becker [Sun, 4 Nov 2018 15:46:27 +0000 (16:46 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
Christoph M. Becker [Sun, 4 Nov 2018 15:44:06 +0000 (16:44 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
Christoph M. Becker [Sun, 4 Nov 2018 15:40:27 +0000 (16:40 +0100)]
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
“Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end.”
Anatol Belski [Sun, 4 Nov 2018 12:11:28 +0000 (13:11 +0100)]
Rework places in libmagic regarding previous CVE-2014-3538 fixes
CVE-2014-3538 was fixed upstream, but the old patch was still kept in
the PHP port. This patch causes performance regressions when PCRE JIT is
not enabled. This is fixed by applying the relevant original code from
the newer libmagic, which makes the old patch obsolete as the
CVE-2014-3538 tests still pass.
Anatol Belski [Sat, 3 Nov 2018 19:29:51 +0000 (20:29 +0100)]
Change the way JIT availability is checked
The pcre2_jit_compile_8 sysmbol is always available, even JIT might be
not. If JIT is not enabled explicitly and is enabled in the PHP runtime,
this will lead to a malfunction. This approach ensures JIT is indeed
available on the given platform. For cross compilation this might get
complicated, as it would require an explicit processor architecture and
PCRE2 version check.
Another solution for this case is to run pcre2_config at runtime. That
however would require more condition checks that would impact
architectures where JIT is available.
Nikita Popov [Fri, 2 Nov 2018 13:30:23 +0000 (14:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 2 Nov 2018 13:26:24 +0000 (14:26 +0100)]
Fixed bug #77092
Weird that this worked for so long, probably because nearly all
ext/standard functions use fast ZPP rather than ordinary ZPP.
Zeev Suraski [Thu, 1 Nov 2018 16:35:32 +0000 (18:35 +0200)]
Future-proof email addresses
Rasmus Lerdorf [Wed, 31 Oct 2018 18:41:17 +0000 (11:41 -0700)]
Fix stray newline that caused this test to fail
Rasmus Lerdorf [Wed, 31 Oct 2018 17:58:45 +0000 (10:58 -0700)]
Fix session tests that fail if error_log is set
Rasmus Lerdorf [Wed, 31 Oct 2018 17:43:45 +0000 (10:43 -0700)]
This test needs to log to stdout
Anatol Belski [Tue, 30 Oct 2018 19:43:45 +0000 (20:43 +0100)]
Fix error condition
Anatol Belski [Tue, 30 Oct 2018 19:42:00 +0000 (20:42 +0100)]
Fixed bug #77081 ftruncate() changes seek pointer in c mode
Christoph M. Becker [Tue, 30 Oct 2018 17:53:03 +0000 (18:53 +0100)]
Fix and improve test case
We fix the erroneous doctype declaration, clarify the expectation, and
add a comment to clarify the purpose of the tag mismatch in the XML.
Derick Rethans [Tue, 30 Oct 2018 11:25:48 +0000 (11:25 +0000)]
Updated to version 2018.7 (2018g)
Derick Rethans [Tue, 30 Oct 2018 11:25:47 +0000 (11:25 +0000)]
Empty merge
Derick Rethans [Tue, 30 Oct 2018 11:25:45 +0000 (11:25 +0000)]
Updated to version 2018.7 (2018g)
Peter Kokot [Mon, 29 Oct 2018 23:24:07 +0000 (00:24 +0100)]
[ci skip] Update NEWS
Peter Kokot [Mon, 29 Oct 2018 23:23:38 +0000 (00:23 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
fix bug #77079
Peter Kokot [Mon, 29 Oct 2018 23:23:20 +0000 (00:23 +0100)]
[ci skip] Update NEWS
Peter Kokot [Mon, 29 Oct 2018 23:22:26 +0000 (00:22 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
fix bug #77079
Peter Kokot [Mon, 29 Oct 2018 23:22:03 +0000 (00:22 +0100)]
[ci skip] Update NEWS
Jon Allen [Mon, 29 Oct 2018 13:44:37 +0000 (14:44 +0100)]
fix bug #77079
Nikita Popov [Mon, 29 Oct 2018 17:56:17 +0000 (18:56 +0100)]
Fix mb_strrpos() with encoding passed as 3rd param
Christoph M. Becker [Sun, 28 Oct 2018 11:48:07 +0000 (12:48 +0100)]
[ci skip] Update UPGRADING
PR #3317[1] is relevant for the migration guide, so we add a respective
note in UPGRADING.
[1] <https://github.com/php/php-src/pull/3317>
Christoph M. Becker [Sat, 27 Oct 2018 15:30:13 +0000 (17:30 +0200)]
Fix #71592: External entity processing never fails
If the callback set via `xml_set_external_entity_ref_handler()` returns
a falsy value, parsing is supposed to stop and the error number set to
`XML_ERROR_EXTERNAL_ENTITY_HANDLING`. This is already correctly done
by the libexpat binding, but the libxml2 binding ignores the return
value. We fix this by calling `xmlStopParser()` which is available as
of libxml 2.1.0[1] (PHP-7.1 requires at least libxml 2.6.11 anyway),
and setting the desired `errNo` ourselves.
[1] <http://xmlsoft.org/news.html>
Adam Harvey [Thu, 25 Oct 2018 18:55:43 +0000 (11:55 -0700)]
[ci skip] Fix indentation in UPGRADING.
Nikita Popov [Thu, 25 Oct 2018 14:31:10 +0000 (16:31 +0200)]
Don't optimize function if inference failed
This was respected only for the single-function optimizations, not
in func-info mode.
Nikita Popov [Thu, 25 Oct 2018 14:44:07 +0000 (16:44 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 25 Oct 2018 14:43:07 +0000 (16:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 25 Oct 2018 14:25:54 +0000 (16:25 +0200)]
Fixed bug #77058
Account for the fact that undef must be interpreted as null for
the purposes of INC/DEC inference.
Nikita Popov [Thu, 25 Oct 2018 14:18:10 +0000 (16:18 +0200)]
Improve "narrowing" error message
By including the opcode name.
Dmitry Stogov [Wed, 24 Oct 2018 12:45:34 +0000 (15:45 +0300)]
Fixed reseting of interned strings buffer.
Dmitry Stogov [Wed, 24 Oct 2018 08:49:44 +0000 (11:49 +0300)]
Make php_plain_files_wrapper to be writable (workaround for swoole)
Joe Watkins [Wed, 24 Oct 2018 06:43:27 +0000 (08:43 +0200)]
bump versions
Υоаnn B [Mon, 22 Oct 2018 14:26:58 +0000 (16:26 +0200)]
fix typo in sysvsem.c
Nikita Popov [Tue, 23 Oct 2018 12:24:29 +0000 (14:24 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Cameron Porter [Sat, 6 Oct 2018 06:09:22 +0000 (01:09 -0500)]
Fixed bug #50675
SOAP: Stop overwriting the node name when creating an XML node
for an object reference.
Remi Collet [Tue, 23 Oct 2018 10:16:31 +0000 (12:16 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump to 7.2.13-dev
Updated to version 2018.6 (2018f)
Updated to version 2018.6 (2018f)
Remi Collet [Tue, 23 Oct 2018 10:15:30 +0000 (12:15 +0200)]
bump to 7.2.13-dev
Christoph M. Becker [Tue, 23 Oct 2018 10:10:09 +0000 (12:10 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0RC4 tagging
Derick Rethans [Mon, 22 Oct 2018 11:05:40 +0000 (12:05 +0100)]
Updated to version 2018.6 (2018f)
Derick Rethans [Mon, 22 Oct 2018 11:05:40 +0000 (12:05 +0100)]
Empty merge
Derick Rethans [Mon, 22 Oct 2018 11:05:39 +0000 (12:05 +0100)]
Updated to version 2018.6 (2018f)
Jakub Zelenka [Sun, 21 Oct 2018 18:39:47 +0000 (19:39 +0100)]
Fix arginfo and clean up fpm_get_status
Christoph M. Becker [Sun, 21 Oct 2018 10:10:54 +0000 (12:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75282: xmlrpc_encode_request() crashes
Christoph M. Becker [Sun, 21 Oct 2018 10:06:55 +0000 (12:06 +0200)]
Fix #75282: xmlrpc_encode_request() crashes
Since we allow ext/xmlrpc to be built against a system libxmlrpc(-epi),
we must not `efree` memory which has been allocated via `malloc`. To
distinguish bundled and system libxmlrpc(-epi) we introduce the macro
`HAVE_XMLRPC_BUNDLED` (analogous to how it is done by ext/gd). We
deliberately keep the ugly `#ifdef`s, instead of tucking them away in
an `XMLRPC_FREE()` macro, to not forget that it is a bad idea to fork
and bundle a library, but to also allow building against an unpatched
system lib.
Anatol Belski [Sat, 20 Oct 2018 21:04:54 +0000 (23:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests for ICU 63.1
Anatol Belski [Sat, 20 Oct 2018 21:04:15 +0000 (23:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tests for ICU 63.1
Anatol Belski [Sat, 20 Oct 2018 21:02:06 +0000 (23:02 +0200)]
Fix tests for ICU 63.1
The most of change is U+00A0 vs. new U+202F used in some outputs.
Peter Kokot [Sat, 20 Oct 2018 07:55:07 +0000 (09:55 +0200)]
[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:54:00 +0000 (09:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77041: buildconf should output error messages to stderr
Peter Kokot [Sat, 20 Oct 2018 07:52:46 +0000 (09:52 +0200)]
[ci skip] Update NEWS
Peter Kokot [Sat, 20 Oct 2018 07:51:22 +0000 (09:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix #77041: buildconf should output error messages to stderr
Peter Kokot [Sat, 20 Oct 2018 07:48:50 +0000 (09:48 +0200)]
[ci skip] Update NEWS
Mizunashi Mana [Sat, 20 Oct 2018 07:42:56 +0000 (09:42 +0200)]
Fix #77041: buildconf should output error messages to stderr
Peter Kokot [Thu, 18 Oct 2018 22:12:34 +0000 (00:12 +0200)]
[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:10:22 +0000 (00:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Peter Kokot [Thu, 18 Oct 2018 22:08:57 +0000 (00:08 +0200)]
[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:07:42 +0000 (00:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Peter Kokot [Thu, 18 Oct 2018 22:06:11 +0000 (00:06 +0200)]
[ci skip] Update NEWS
Peter Kokot [Thu, 18 Oct 2018 22:02:09 +0000 (00:02 +0200)]
Fix #77035: The phpize and ./configure create redundant .deps file
The `.deps` file(s) was once used by Automake and created to write
dependencies to it. The file creation has been removed via the commit
779c11af21cf8a627b8f2f2edef9e9073c76ed94 .
The phpize and ./configure script create a redundant .deps file in a
PECL extension directory which might cause confusions why is it used.
Today it is no longer relevant so this redundant artefact can be
removed in the phpize configure script.
Peter Kokot [Thu, 18 Oct 2018 21:39:39 +0000 (23:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests/output/bug74815.phpt generating errors.log
Peter Kokot [Thu, 18 Oct 2018 14:30:18 +0000 (16:30 +0200)]
Fix tests/output/bug74815.phpt generating errors.log
Test tests/output/bug74815.phpt was creating an errors.log file
in project root directory and didn't removed it after the test.
Anatol Belski [Wed, 17 Oct 2018 22:45:17 +0000 (00:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test when it's run on another drive
Anatol Belski [Wed, 17 Oct 2018 22:44:43 +0000 (00:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test when it's run on another drive
Anatol Belski [Wed, 17 Oct 2018 22:43:24 +0000 (00:43 +0200)]
Fix test when it's run on another drive
Christoph M. Becker [Wed, 17 Oct 2018 21:41:37 +0000 (23:41 +0200)]
[ci skip] Update UPGRADING wrt. tidyp support
This is especially noteworthy since `tidy_get_relase()` returns
'unknown' when built against libtidyp, which might break some code
which relies on `tidy_get_release()` to return a date formatted as
`yyyy/mm/dd`.
Christoph M. Becker [Wed, 17 Oct 2018 14:36:25 +0000 (16:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77027: tidy::getOptDoc() not available on Windows
Christoph M. Becker [Wed, 17 Oct 2018 14:29:38 +0000 (16:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77027: tidy::getOptDoc() not available on Windows
Christoph M. Becker [Wed, 17 Oct 2018 14:27:07 +0000 (16:27 +0200)]
Fix #77027: tidy::getOptDoc() not available on Windows
We define the `HAVE_TIDYOPTGETDOC` macro unconditionally, since the
Windows PHP SDK ships libtidy 2009/04/06 or newer for a long time.
We do not add a regression test, since 021.phpt already tests
`tidy_get_opt_doc`, but has previously been skipped due to
unavailability of the function.