1
0
mirror of https://github.com/php/php-src.git synced 2026-04-13 02:52:48 +02:00
Commit Graph

49325 Commits

Author SHA1 Message Date
Anatol Belski
3c0ac24258 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix regex
  Fix regex
2018-11-10 12:13:29 +01:00
Anatol Belski
992e4fbc65 Fix regex 2018-11-10 12:13:03 +01:00
Mizunashi Mana
8021e0f5dc Suppress already used warning 2018-11-09 11:09:16 +01:00
Mizunashi Mana
17d76e530d Ignore getaddrinfo failed message 2018-11-08 21:46:03 +01:00
Mizunashi Mana
c180c8c3bd Clean testfile 2018-11-08 14:29:39 +01:00
Mizunashi Mana
705a31b4e5 Skip SQLite3::loadExtension tests if SQLITE_OMIT_LOAD_EXTENSION defined 2018-11-08 14:27:12 +01:00
Mizunashi Mana
632b6e7aac Add putenv for setlocale for gettext tests 2018-11-07 18:54:47 +01:00
Christoph M. Becker
b7b3a65e1d Avoid needless string duplication
Cf. <https://github.com/php/php-src/pull/3636#issuecomment-436638833>.
2018-11-07 17:10:35 +01:00
Eli Schwartz
2d03197749 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
2018-11-07 13:05:47 +01:00
Dmitry Stogov
f200298075 Avoid double copying 2018-11-07 14:23:34 +03:00
Dmitry Stogov
8c7aa88e2d Fixed crash introduced by bfaf662ac2 2018-11-07 09:36:21 +03:00
Dmitry Stogov
bc53642c05 *printf() optimization and v*printf() warning message fix. 2018-11-07 02:40:15 +03:00
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