]>
granicus.if.org Git - php/log
Peter Kokot [Sat, 10 Nov 2018 01:47:26 +0000 (02:47 +0100)]
Remove lexer files generated by RE2C
This patch removes generated lexer files by re2c during the build
process so they are not tracked by Git yet can be still shipped when
PHP is released. The genfiles script additionally provides generation
of these lexer files when creating a release of the PHP source code.
The genfiles script refactorings:
- added file header
- echoing steps instead of comments
- cleaning only lines starting with `#line`
- eval removed in favor of direct executed commands
- the debug mode `set -x` removed
- script can be called from any path
- improved comments
Anatol Belski [Sat, 10 Nov 2018 21:03:07 +0000 (22:03 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update libmagic.patch [ci skip]
Update libmagic.patch [ci skip]
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:52 +0000 (20:07 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fork test with pcre.jit=0
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:26:04 +0000 (18:26 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Rework magic data
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:29 +0000 (12:13 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix regex
Fix regex
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:52 +0000 (01:32 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Rework magic data
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:56 +0000 (00:20 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Sync one more upstream libmagic piece
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
Mizunashi Mana [Fri, 9 Nov 2018 06:53:15 +0000 (15:53 +0900)]
Suppress already used warning
Mizunashi Mana [Thu, 8 Nov 2018 17:44:54 +0000 (02:44 +0900)]
Ignore getaddrinfo failed message
Mizunashi Mana [Thu, 8 Nov 2018 09:51:17 +0000 (18:51 +0900)]
Clean testfile
Mizunashi Mana [Thu, 8 Nov 2018 11:47:11 +0000 (12:47 +0100)]
Skip SQLite3::loadExtension tests if SQLITE_OMIT_LOAD_EXTENSION defined
Nikita Popov [Wed, 7 Nov 2018 19:22:41 +0000 (20:22 +0100)]
Use new option name in travis/compile.sh
Mizunashi Mana [Sun, 28 Oct 2018 19:33:53 +0000 (04:33 +0900)]
Add putenv for setlocale for gettext tests
Levi Morrison [Wed, 7 Nov 2018 01:39:22 +0000 (18:39 -0700)]
Remove do_bind_inherited_class; use do_bind_class
Pass NULL as the second parameter. I don't know if in the past these
differed more, but there isn't any point to having both of them
anymore.
Christoph M. Becker [Wed, 7 Nov 2018 15:37:00 +0000 (16:37 +0100)]
Avoid needless string duplication
Cf. <https://github.com/php/php-src/pull/3636#issuecomment-
436638833 >.
Eli Schwartz [Mon, 14 May 2018 21:25:37 +0000 (17:25 -0400)]
ext/gd: Use pkg-config to detect the availability of freetype2
The latest version of freetype2 does not install freetype-config by
default, but pkg-config support has been there for approximately 15
years. In order to reliably detect freetype2, pkg-config *must* be used.
See:
https://savannah.nongnu.org/bugs/?53093
https://bugs.php.net/bug.php?id=76324
Dmitry Stogov [Wed, 7 Nov 2018 11:23:34 +0000 (14:23 +0300)]
Avoid double copying
Dmitry Stogov [Wed, 7 Nov 2018 06:36:21 +0000 (09:36 +0300)]
Dmitry Stogov [Tue, 6 Nov 2018 23:40:15 +0000 (02:40 +0300)]
*printf() optimization and v*printf() warning message fix.
Dmitry Stogov [Tue, 6 Nov 2018 20:11:28 +0000 (23:11 +0300)]
Removed dead checks
Dmitry Stogov [Tue, 6 Nov 2018 19:37:04 +0000 (22:37 +0300)]
Reorder conditions and set expectation.
Dmitry Stogov [Tue, 6 Nov 2018 14:04:17 +0000 (17:04 +0300)]
Micro-optimization
Christoph M. Becker [Tue, 6 Nov 2018 10:46:47 +0000 (11:46 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS wrt. php-7.3.0RC5 tagging
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:54:17 +0000 (22:54 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS [ci skip]
Update NEWS [ci skip]
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:54 +0000 (22:25 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update libmagic.patch [ci skip]
Update libmagic.patch [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:30:02 +0000 (21:30 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Declare function proto in header
Declare function proto in header
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:25:22 +0000 (18:25 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #76825: Undefined symbols ___cpuid_count
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:49 +0000 (17:06 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
NEWS
Fix: #77110 undefined symbol zend_string_equal_val in C++ build
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
Dan Wallis [Mon, 5 Nov 2018 13:27:06 +0000 (14:27 +0100)]
Fix #77105: Use position:sticky for <th> in `phpinfo()`
This ensures tables remain legible when scrolling. If the user agent
does not support this feature, then it will gracefully degrade to
existing behaviour.
This patch implements: https://bugs.php.net/bug.php?id=77105
Anatol Belski [Mon, 5 Nov 2018 00:16:54 +0000 (01:16 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Implement handling for JIT recognition when cross compiling
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 16:00:02 +0000 (17:00 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Backport
7f5f4601 for 7.2
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:48:13 +0000 (16:48 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
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:18:48 +0000 (13:18 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Rework places in libmagic regarding previous CVE-2014-3538 fixes
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:51:22 +0000 (20:51 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Change the way JIT availability is checked
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.
Mizunashi Mana [Sun, 28 Oct 2018 16:04:52 +0000 (01:04 +0900)]
Fix a test for ldap extension
Nikita Popov [Fri, 2 Nov 2018 13:34:11 +0000 (14:34 +0100)]
Merge branch 'PHP-7.3'
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
Zeev Suraski [Thu, 1 Nov 2018 16:30:28 +0000 (18:30 +0200)]
Future-proof email addresses...
Zeev Suraski [Thu, 1 Nov 2018 15:20:07 +0000 (17:20 +0200)]
Update email addresses. We're still @Zend, but future proofing it...
Rasmus Lerdorf [Wed, 31 Oct 2018 18:41:42 +0000 (11:41 -0700)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix stray newline that caused this test to fail
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:59:31 +0000 (10:59 -0700)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix session tests that fail if error_log is set
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:44:01 +0000 (10:44 -0700)]
Merge branch 'PHP-7.3'
* PHP-7.3:
This test needs to log to stdout
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:50:07 +0000 (20:50 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix error condition
Fixed bug #77081 ftruncate() changes seek pointer in c mode
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:55:16 +0000 (18:55 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix and improve test case
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.
Dmitry Stogov [Tue, 30 Oct 2018 13:13:45 +0000 (16:13 +0300)]
Keep original value of "prototype"
Dmitry Stogov [Tue, 30 Oct 2018 12:08:45 +0000 (15:08 +0300)]
Call function_add_ref() in proper place
Dmitry Stogov [Tue, 30 Oct 2018 12:08:30 +0000 (15:08 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Updated to version 2018.7 (2018g)
Updated to version 2018.7 (2018g)
Updated to version 2018.7 (2018g)
Derick Rethans [Tue, 30 Oct 2018 11:25:49 +0000 (11:25 +0000)]
Updated to version 2018.7 (2018g)
Derick Rethans [Tue, 30 Oct 2018 11:25:49 +0000 (11:25 +0000)]
Empty merge
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)
Dmitry Stogov [Tue, 30 Oct 2018 10:16:49 +0000 (13:16 +0300)]
Reslove inherited op_array references once afrer all optimizations.
Peter Kokot [Mon, 29 Oct 2018 23:24:20 +0000 (00:24 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
fix bug #77079
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