Dmitry Stogov
cdbbc802b4
Removed dead checks
2018-11-06 23:11:28 +03:00
Dmitry Stogov
bfaf662ac2
Micro-optimization
2018-11-06 17:04:17 +03:00
Anatol Belski
2e336329e0
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Update libmagic.patch [ci skip]
Update libmagic.patch [ci skip]
2018-11-05 22:25:54 +01:00
Anatol Belski
a957af6c06
Update libmagic.patch [ci skip]
2018-11-05 22:25:31 +01:00
Anatol Belski
956708acac
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Declare function proto in header
Declare function proto in header
2018-11-05 21:30:02 +01:00
Anatol Belski
29dcf19f8b
Declare function proto in header
2018-11-05 21:29:35 +01:00
Dan Wallis
eb1233533e
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
2018-11-05 14:27:06 +01:00
Anatol Belski
c364edf7f2
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Implement handling for JIT recognition when cross compiling
2018-11-05 01:16:54 +01:00
Anatol Belski
68ad401b34
Implement handling for JIT recognition when cross compiling
2018-11-05 01:15:09 +01:00
Christoph M. Becker
b6f5183816
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
2018-11-04 16:48:13 +01:00
Christoph M. Becker
579d76d87b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
2018-11-04 16:47:13 +01:00
Christoph M. Becker
0afc818976
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
2018-11-04 16:44:45 +01:00
Christoph M. Becker
625f614cb1
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
...
“Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end.”
2018-11-04 16:40:27 +01:00
Anatol Belski
424d5a60dd
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Rework places in libmagic regarding previous CVE-2014-3538 fixes
2018-11-04 13:18:48 +01:00
Anatol Belski
7f5f46013b
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.
2018-11-04 13:11:28 +01:00
Anatol Belski
d4761b64e7
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Change the way JIT availability is checked
2018-11-03 20:51:22 +01:00
Anatol Belski
aea411657e
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.
2018-11-03 20:50:05 +01:00
Mizunashi Mana
e412195772
Fix a test for ldap extension
2018-11-03 17:37:47 +01:00
Nikita Popov
429c5a0a82
Merge branch 'PHP-7.3'
2018-11-02 14:34:11 +01:00
Nikita Popov
d92f7630f7
Merge branch 'PHP-7.2' into PHP-7.3
2018-11-02 14:30:50 +01:00
Nikita Popov
4daa413898
Fixed bug #77092
...
Weird that this worked for so long, probably because nearly all
ext/standard functions use fast ZPP rather than ordinary ZPP.
2018-11-02 14:29:03 +01:00
Zeev Suraski
9afce019e0
Future-proof email addresses
2018-11-01 18:35:32 +02:00
Zeev Suraski
67e0138c0d
Future-proof email addresses...
2018-11-01 18:30:28 +02:00
Rasmus Lerdorf
46b25ee2a9
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fix session tests that fail if error_log is set
2018-10-31 10:59:31 -07:00
Rasmus Lerdorf
4e8195769d
Fix session tests that fail if error_log is set
2018-10-31 10:58:45 -07:00
Anatol Belski
9c9178af51
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fix error condition
Fixed bug #77081 ftruncate() changes seek pointer in c mode
2018-10-30 20:50:07 +01:00
Anatol Belski
8827cc34cf
Fixed bug #77081 ftruncate() changes seek pointer in c mode
2018-10-30 20:42:00 +01:00
Christoph M. Becker
0a1ab6ec2f
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fix and improve test case
2018-10-30 18:55:16 +01:00
Christoph M. Becker
2816a3fdfa
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.
2018-10-30 18:53:03 +01:00
Dmitry Stogov
bf38e6c10a
Keep original value of "prototype"
2018-10-30 16:13:45 +03:00
Dmitry Stogov
e5edaed69b
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)
2018-10-30 15:08:30 +03:00
Derick Rethans
6ad8edee92
Updated to version 2018.7 (2018g)
2018-10-30 11:25:49 +00:00
Derick Rethans
10255a0cd9
Updated to version 2018.7 (2018g)
2018-10-30 11:25:48 +00:00
Derick Rethans
e58388ea6d
Updated to version 2018.7 (2018g)
2018-10-30 11:25:45 +00:00
Dmitry Stogov
ebf44fbbda
Reslove inherited op_array references once afrer all optimizations.
2018-10-30 13:16:49 +03:00
Peter Kokot
4828fb7b6b
Merge branch 'PHP-7.3'
...
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
fix bug #77079
2018-10-30 00:24:20 +01:00
Peter Kokot
82115849b3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
fix bug #77079
2018-10-30 00:23:38 +01:00
Peter Kokot
b1de24e68c
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
fix bug #77079
2018-10-30 00:22:26 +01:00
Jon Allen
8775bead3a
fix bug #77079
2018-10-30 00:19:07 +01:00
Nikita Popov
6da3eac56a
Add missing null initialization
2018-10-29 20:57:21 +01:00
Nikita Popov
837843ff4a
Remove redundant mbfl_string_init calls
...
No need to do this if we already fully initialize the string.
2018-10-29 20:29:23 +01:00
Nikita Popov
a7d6b2c1fb
Use zend_string for mbstring last encoding cache
...
Saves us a string duplication, as well as case-insensitive string
comparisons for the likely case of an interned string encoding.
2018-10-29 20:29:22 +01:00
Dmitry Stogov
2491b7b65a
Removed dead code
2018-10-29 21:38:25 +03:00
Nikita Popov
493b534c84
Merge branch 'PHP-7.3'
2018-10-29 18:56:43 +01:00
Nikita Popov
09c7108f74
Fix mb_strrpos() with encoding passed as 3rd param
2018-10-29 18:56:17 +01:00
Dmitry Stogov
359f19edc9
Optimize substr() edge-case conditions
2018-10-29 13:11:41 +03:00
Christoph M. Becker
c37beb7eb5
Merge branch 'PHP-7.3'
...
* PHP-7.3:
Fix #71592 : External entity processing never fails
2018-10-27 17:31:29 +02:00
Christoph M. Becker
829b0df77b
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 >
2018-10-27 17:30:13 +02:00
Christoph M. Becker
0d6490598d
Add TIDY_TAG_* constants supported by libtidy 5
...
Cf. <http://api.html-tidy.org/tidy/tidylib_api_5.0.0/tidyenum_8h.html#ae5b597c0999422ff383f08ab595ef5e8a16d20becf3c3cb022ddabccc83d8c314 >.
2018-10-27 16:17:09 +02:00
Gabriel Caruso
388c21e764
Add is_iterable to opcache Optimizer
2018-10-26 08:14:45 -03:00