php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 03:22:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
119,580 Commits 547 Branches 1,483 Tags
4659c12ae044154d112aec32d9dcb2ee65db7357
Commit Graph

119580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
4659c12ae0 Fix #79846: 8c67c16699 broke simple regexp 
We backport the respective upstream fix[1].

[1] <https://vcs.pcre.org/pcre2?view=revision&revision=1267>
 2020-07-16 18:32:26 +02:00
Dmitry Stogov
03a98d9420 cleanup 2020-07-16 17:09:14 +03:00
Christoph M. Becker
7e357f470d Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enable further tests on Windows
 2020-07-16 16:08:07 +02:00
Christoph M. Becker
c1b5e7a9ab Enable further tests on Windows 2020-07-16 16:07:23 +02:00
Dmitry Stogov
d50919a03b Check type guard on result of FETCH_OBJ_R/IS instructions 2020-07-16 15:14:11 +03:00
Remi Collet
50fb12c39b Merge branch 'PHP-7.4' 
* PHP-7.4:
  #79657 was cherry-picked in 7.4.7
 2020-07-16 12:05:58 +02:00
Remi Collet
6ffe08d131 #79657 was cherry-picked in 7.4.7 2020-07-16 12:05:45 +02:00
Christoph M. Becker
b31c787401 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix readlink related memory leak
 2020-07-16 09:18:45 +02:00
Christoph M. Becker
27bb0d9164 Fix readlink related memory leak 2020-07-16 09:16:48 +02:00
Dmitry Stogov
ebb94af754 Fixed tracing JIT for ASSIGN to typed reference 2020-07-16 00:19:00 +03:00
Pedro Magalhães
272b887b7b Ignore inheritance rules on private methods 
Closes GH-5401
 2020-07-15 17:09:57 +01:00
Christoph M. Becker
371e29ef3a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix tests regarding negative fileinode()
 2020-07-15 16:39:54 +02:00
Christoph M. Becker
dd1d1191e1 Fix tests regarding negative fileinode() 
The results of `fileinode()` may be negative due to wrap-around
behavior (at least on Windows as of PHP 7.4.0).
 2020-07-15 16:38:38 +02:00
Dmitry Stogov
f74e9a4dd3 Check type guard on result of FETCH_DIM_R/IS instructions 2020-07-15 17:28:46 +03:00
Nikita Popov
1c0ee68b83 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78008: dns_check_record() always return true on Alpine
 2020-07-15 15:10:50 +02:00
Nikita Popov
2053329b1a Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78008: dns_check_record() always return true on Alpine
 2020-07-15 15:10:40 +02:00
Andy Postnikov
2c57378bd3 Fix bug #78008: dns_check_record() always return true on Alpine 
- free handle before return result
- cleaned up remaining usage of MAXPACKET
- update dns_get_mx() to use the same approach

Closes GH-5854.
 2020-07-15 15:10:19 +02:00
Nikita Popov
5785a15f4e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79862
 2020-07-15 15:00:45 +02:00
Nikita Popov
e8430b592f Fixed bug #79862 
While normally a private property in the active scope would take
priority, we should not use this if it has the wrong "staticness".
 2020-07-15 14:59:55 +02:00
Nikita Popov
9a1a94e9b9 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79820
 2020-07-15 10:59:32 +02:00
Christopher Broadbent
ee7c7a8e26 Fixed bug #79820 
Similar to what is done for ReflectionType itself, copy the
type name stored inside ReflectionProperty. Also make sure the
type field is always initialized for dynamic properties.

This is a non-issue in PHP 8, because we store a pointer to the
property_info there, rather than a copy.
 2020-07-15 10:58:56 +02:00
Nikita Popov
f60cf0cfe7 Remove type argument from zend_get_zval_ptr 
As pointed out by Levi, this is unused, and we already changed
the signature of this function for PHP 8.
 2020-07-15 09:51:51 +02:00
Christopher Jones
3804858c47 Retrofit description of recent PR changes 2020-07-15 13:44:32 +10:00
Nikita Popov
27800441b5 Reduce scope of preload compiler_options 
Only set preloading compiler_options while executing the preload
file, not when performing linking afterwards. Otherwise options
like IGNORE_INTERNAL_CLASSES will hide classes from inheritance
verification.
 2020-07-14 16:10:04 +02:00
Nikita Popov
b702ad14c9 Fix preloading of union typed property inherited from internal class 
Tricky edge case: We inherit a property from an internal class,
in which case no property duplication takes place. We should not
try to persist the property info in that case. This didn't really
matter previously, but now that the property has some non-interned
owned data (the type), we need to make sure we don't try to free
that.
 2020-07-14 15:24:58 +02:00
Nikita Popov
7e6b2e2e23 Check for name vs ce in a few more places 
The type lists may contain CEs, we should not assume they only
contain names.
 2020-07-14 14:47:47 +02:00
Dmitry Stogov
7c16d11e3c Tracing JIT for SWITCH instructions 2020-07-14 15:15:08 +03:00
Dmitry Stogov
ddba2a705e Better support for 64-bit .aword constants 2020-07-14 15:14:21 +03:00
Nikita Popov
06162194d6 Fix preloading property type resolution 
This was causing many failures under --preload...
 2020-07-14 12:59:04 +02:00
Nikita Popov
e5cb53ec68 Merge branch 'PHP-7.4' 
* PHP-7.4:
 2020-07-14 12:44:06 +02:00
Nikita Popov
f855b59994 Merge remote-tracking branch 'upstream/PHP-7.4' into PHP-7.4 
* upstream/PHP-7.4:
  Fix test for x86 Windows
 2020-07-14 12:43:58 +02:00
Nikita Popov
745bc4c2ea Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #79849
 2020-07-14 12:43:03 +02:00
Nikita Popov
162776a132 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #79849
 2020-07-14 12:42:46 +02:00
Evgeny Stepanischev
ce149b0cb8 Fixed bug #79849 
Closes GH-5853.
 2020-07-14 12:41:43 +02:00
Nikita Popov
70501b81a7 Fixed bug #79852 2020-07-14 12:31:06 +02:00
Nikita Popov
8c89f23c45 Use different scratch register 
r1 clashes with FCARG1a on Windows, so use a different scratch
register. FCARG2a should be free here. Hopefully fixes the
AppVeyor build.
 2020-07-14 10:52:50 +02:00
Martin Schröder
547d98b81d Support socketpairs in proc_open() 
Closes GH-5777.
 2020-07-14 10:35:45 +02:00
Christoph M. Becker
1a00d015be Remove out-dated comment 
ZTS support has been added around ~7.2.
 2020-07-13 19:14:59 +02:00
Christoph M. Becker
11a628d96c Fix typos 2020-07-13 19:13:45 +02:00
Nikita Popov
e59efb3740 Put debug function behind ifdef 2020-07-13 17:24:31 +02:00
Nikita Popov
2edc5e00ac Add user upgrading note for no_separation change 
I added this to UPGRADING.INTERNALS, but it should also be
mentioned in UPGRADING, as it affects user-visible behavior.

[ci skip]
 2020-07-13 14:50:25 +02:00
Nikita Popov
0cab3fa10e Add upgrading note for crypt change 
[ci skip]
 2020-07-13 14:44:17 +02:00
Nikita Popov
2d98f0cad2 Restore warning 2020-07-13 14:40:19 +02:00
George Peter Banyard
4f3eccfd4d Use consistent types 
uint32_t type for argument count
size_t for length of char*
zend_bool for a zval bool arg

Closes GH-5845
 2020-07-13 13:30:54 +02:00
Dmitry Stogov
48963378c1 Improved reference-counting inference 2020-07-13 13:08:32 +03:00
Nikita Popov
0280c64a2e Add upgrading note 
[ci skip]
 2020-07-13 11:47:25 +02:00
Remi Collet
4884f1be85 define COMPILER and ARCHITECTURE from environment 2020-07-13 11:14:02 +02:00
Rowan Tommins
55a15f32ce Improve output of tokens in Parse Errors 
Currently, unexpected tokens in the parser are shown as the text
found, plus the internal token name, including the notorious
"unexpected '::' (T_PAAMAYIM_NEKUDOTAYIM)".

This commit replaces that with a more user-friendly format, with
two main types of token:

* Tokens which always represent the same text are shown like
  'unexpected token "::"' and 'expected "::"'
* Tokens which have variable text are given a user-friendly
  name, and show like 'unexpected identifier "foo"', and
  'expected identifer'.

A few tokens have special cases:

* unexpected token """ -> unexpected double-quote mark
* unexpected quoted string "'foo'" -> unexpected single-quoted
  string "foo"
* unexpected quoted string ""foo"" -> unexpected double-quoted
  string "foo"
* unexpected illegal character "_" -> unexpected character 0xNN
  (where _ is almost certainly a control character, and NN is the
   hexadecimal value of the byte)

The \ token has a special case in the implementation just to stop
bison making a mess of escaping it and it coming out as \\
 2020-07-13 11:07:40 +02:00
Dmitry Stogov
d4fdf79add JIT for array merging 2020-07-13 12:04:08 +03:00
Nat Wyatt
6f48ccf51c Fix compilation errors when EXIF_DEBUG is defined 
Fix warnings and error when compiling with EXIF_DEBUG defined.

Closes GH-5838.
 2020-07-13 11:00:02 +02:00