1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 01:18:19 +02:00
Commit Graph

49363 Commits

Author SHA1 Message Date
Dmitry Stogov 45fdd034ce Properly resolve magic method of preloaded classes inherited from internal ones. 2018-11-09 13:07:03 +03:00
Dmitry Stogov 34645aeb42 Don't preload constants defined during preload script excution. 2018-11-08 15:29:17 +03:00
Dmitry Stogov cef0d67c3e Support for class aliasses 2018-11-07 15:56:54 +03:00
Dmitry Stogov 08ffc9a552 Resolve constants only in linked classes 2018-11-07 15:34:39 +03:00
Dmitry Stogov 8d3429cda8 Fixed preloading of references to internal classes. 2018-11-06 11:56:39 +03:00
Dmitry Stogov 7ae3a47d20 Merge branch 'master' into preload
* master:
  Update NEWS [ci skip]
  Update NEWS [ci skip]
  Update libmagic.patch [ci skip]
  Update libmagic.patch [ci skip]
  Declare function proto in header
  Declare function proto in header
  Fix #76825: Undefined symbols ___cpuid_count
  NEWS
  Fix: #77110 undefined symbol zend_string_equal_val in C++ build
  Fix #77105: Use position:sticky for <th> in `phpinfo()`
  Implement handling for JIT recognition when cross compiling
  Backport 7f5f4601 for 7.2
  Fix #76348: WSDL_CACHE_MEMORY causes Segmentation fault
  Rework places in libmagic regarding previous CVE-2014-3538 fixes
  Change the way JIT availability is checked
  Fix a test for ldap extension
  Fixed bug #77092
  Future-proof email addresses
2018-11-06 11:37:15 +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
Dmitry Stogov 9b0a53ed1c We don't need preload_restart() here 2018-11-02 14:54:44 +03:00
Dmitry Stogov 0bd17bd438 EG(*) may be not initializd at this point - use CG(*). 2018-11-02 14:44:30 +03:00
Dmitry Stogov b610467051 Merge branch 'master' into preload
* master:
  Future-proof email addresses...
  Update email addresses.  We're still @Zend, but future proofing it...
2018-11-02 11:33:37 +03: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
Dmitry Stogov 3a9d90f74a Fexed resolution of method clones 2018-11-01 15:19:48 +03:00
Dmitry Stogov aea85c65bd Prevent inlining of method copied from trait 2018-11-01 11:45:50 +03:00
Dmitry Stogov 36b644fbb7 Merge branch 'master' into preload
* master:
  Fix stray newline that caused this test to fail
  Fix session tests that fail if error_log is set
  This test needs to log to stdout
  Fix error condition
  Fixed bug #77081 ftruncate() changes seek pointer in c mode
  Fix and improve test case
2018-11-01 10:56:02 +03: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
Dmitry Stogov 7a20781d2e Added test 2018-10-31 00:52:46 +03:00
Dmitry Stogov 4a57b5d563 Fixed preloading of classes linked with traits 2018-10-31 00:50:21 +03: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 68c4f99e23 Added test 2018-10-30 16:25:14 +03:00
Dmitry Stogov 38ab7ef4cf Merge branch 'master' into preload
* master:
  Keep original value of "prototype"
2018-10-30 16:14:39 +03:00
Dmitry Stogov bf38e6c10a Keep original value of "prototype" 2018-10-30 16:13:45 +03:00
Dmitry Stogov eb6e2c529f Merge branch 'master' into preload
* master:
  Call function_add_ref() in proper place
  Updated to version 2018.7 (2018g)
  Updated to version 2018.7 (2018g)
  Updated to version 2018.7 (2018g)
  Reslove inherited op_array references once afrer all optimizations.
2018-10-30 15:35:39 +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