archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
139815 commits 526 branches 1434 tags 864 MiB
Commit graph

366 commits

Author SHA1 Message Date
Nikita Popov
db7702213c Merge branch 'PHP-7.3' into PHP-7.4 2019-09-18 10:45:07 +02:00
Nikita Popov
e11ed02870 Fixed bug #78272 
Use MAP_JIT only when running under hardened runtime, because MAP_JIT
is incompatible with fork().

The check is based on
f879e35e3e.
 2019-09-18 10:41:27 +02:00
Stanislav Malyshev
5a77831a53 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test
 2019-08-25 20:06:50 -07:00
Stanislav Malyshev
c810d3d6ad Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test
 2019-08-25 20:06:43 -07:00
Stanislav Malyshev
d1646e328a Fix test 
Not sure why offset changed... probably different PCRE version calculates
them in different way.
 2019-08-25 20:06:02 -07:00
Stanislav Malyshev
c176c666e3 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #75457: heap-use-after-free in php7.0.25
 2019-08-25 19:21:13 -07:00
Stanislav Malyshev
9f269d0d27 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #75457: heap-use-after-free in php7.0.25
 2019-08-25 19:21:08 -07:00
Stanislav Malyshev
5d25ebb0dd Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #75457: heap-use-after-free in php7.0.25
 2019-08-25 19:21:04 -07:00
Stanislav Malyshev
4b4a656d9e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75457: heap-use-after-free in php7.0.25
 2019-08-25 19:20:59 -07:00
Christoph M. Becker
7bf1f9d561 Fix #75457: heap-use-after-free in php7.0.25 
Backport <https://vcs.pcre.org/pcre?view=revision&revision=1638>.
 2019-08-25 19:19:50 -07:00
Remi Collet
8a9e7c8858 Merge branch 'PHP-7.4' 
* PHP-7.4:
  ensure proper settings for test
  Update NEWS for 7.4.0RC1
  Update NEWS for PHP 7.4.0beta4
 2019-08-20 16:31:24 +02:00
Remi Collet
15dcc1817d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  ensure proper settings for test
 2019-08-20 16:31:11 +02:00
Remi Collet
08aafbe93e ensure proper settings for test 2019-08-20 16:30:52 +02:00
Nikita Popov
228bae7d74 Use TypeError for preg_replace type check 
This is a type violation warning, and as such should use TypeError
in PHP 8.
 2019-08-11 14:28:10 +02:00
Stanislav Malyshev
4798570607 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78338: Array cross-border reading in PCRE
 2019-07-29 14:51:35 -07:00
Stanislav Malyshev
fd6874c64d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78338: Array cross-border reading in PCRE
 2019-07-29 14:51:21 -07:00
Christoph M. Becker
8947fd9e9f Fix #78338: Array cross-border reading in PCRE 
We backport r1092 from pcre2.
 2019-07-29 14:49:33 -07:00
Peter Kokot
ca93928f99 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix typos
 2019-07-21 01:02:51 +02:00
Markus Staab
577ed5bfa4 Fix typos 
Closes GH-4447
 2019-07-21 01:01:36 +02:00
Sjon Hortensius
05752d3acf Ref #77388: Don't pass BAD_ESCAPE_IS_LITERAL 
This option is considered dangerous and unwanted. To allow for more
graceful migration don't error on now ignored X modifier.

Closes GH-4430.
 2019-07-18 10:52:27 +02:00
Nikita Popov
b98c148f78 Merge branch 'PHP-7.4' 2019-06-28 15:05:00 +02:00
Nikita Popov
54dd762f59 Set up asan+ubsan scheduled build on azure 
Also adds an --asan flag to run-tests.php to setup all the necessary
environment variables. Some tests are marked as skipped because they
are incompatible with asan or too slow.

I'm basing this on the DEBUG_ZTS build, which seems to give us the
most mileage.
 2019-06-28 15:00:54 +02:00
Nikita Popov
7686b0b889 Merge branch 'PHP-7.4' 2019-06-05 14:53:50 +02:00
Nikita Popov
a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Christoph M. Becker
09cdf51bec Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #77827: preg_match does not ignore \r in regex flags
 2019-03-31 13:36:59 +02:00
Christoph M. Becker
2733420f82 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77827: preg_match does not ignore \r in regex flags
 2019-03-31 13:35:50 +02:00
Christoph M. Becker
d8b7728b0e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77827: preg_match does not ignore \r in regex flags
 2019-03-31 13:33:21 +02:00
Christoph M. Becker
88460c017a Fix #77827: preg_match does not ignore \r in regex flags 2019-03-31 13:31:54 +02:00
Remi Collet
598175eff6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  ensure pcre.jit=1 for this test
 2019-03-22 15:32:07 +01:00
Remi Collet
88c37e0b84 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  ensure pcre.jit=1 for this test
 2019-03-22 15:31:53 +01:00
Remi Collet
e68fd40e22 ensure pcre.jit=1 for this test 2019-03-22 15:31:36 +01:00
Remi Collet
68312cb37d Merge branch 'PHP-7.4' 
* PHP-7.4:
  ensure pcre.jit=1 for these tests
 2019-03-22 15:02:26 +01:00
Remi Collet
cf25a3d64d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  ensure pcre.jit=1 for these tests
 2019-03-22 15:02:13 +01:00
Remi Collet
bb47fb0783 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  ensure pcre.jit=1 for these tests
 2019-03-22 15:01:49 +01:00
Remi Collet
2e9dccef78 ensure pcre.jit=1 for these tests 2019-03-22 15:00:31 +01:00
Nikita Popov
c4b383d663 Merge branch 'PHP-7.4' 2019-03-21 10:23:08 +01:00
Nikita Popov
6311581ac6 Fix bug #73948 
If PREG_UNMATCHED_AS_NULL is used, make sure that unmatched capturing
groups at the end are also set to null, rather than just those in the
middle.
 2019-03-21 09:50:20 +01:00
Remi Collet
28003c1c06 Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix test for upcoming pcre2 10.33
 2019-03-19 16:16:26 +01:00
Remi Collet
29fa3ac8b5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix test for upcoming pcre2 10.33
 2019-03-19 16:16:13 +01:00
Remi Collet
c421d9afec fix test for upcoming pcre2 10.33 
"group name ..." => "subpattern name ..."
 2019-03-19 16:15:14 +01:00
Nikita Popov
a895e58335 Merge branch 'PHP-7.4' 2019-03-19 15:37:07 +01:00
Nikita Popov
f53e7394eb Respect OFFSET_CAPTURE when padding preg_match_all() results 
This issue was mentioned in bug #73948. The PREG_PATTERN_ORDER
padding was performed without respecting the PREF_OFFSET_CAPTURE
flag, which resulted in unmatched subpatterns being either null or
[null, -1] depending on where they occur. Now they will always be
[null, -1], consistent with other usages.
 2019-03-19 15:35:15 +01:00
Nikita Popov
787652b324 Merge branch 'PHP-7.4' 2019-03-19 13:59:48 +01:00
Nikita Popov
2783670daa Merge branch 'PHP-7.3' into PHP-7.4 2019-03-19 13:59:43 +01:00
Nikita Popov
661bce47ae Fixed bug #76127 
Per documentation, and consistent with other preg functions, we
should return false if an error occurred.
 2019-03-19 13:57:39 +01:00
Nikita Popov
e4ee38ab22 Merge branch 'PHP-7.4' 2019-03-19 10:40:08 +01:00
Nikita Popov
12bcdd68b4 Fix #77094: Add flags support for pcre_replace_callback(_array) 2019-03-19 10:38:21 +01:00
Nikita Popov
c4e4ef0498 Merge branch 'PHP-7.4' 2019-03-18 16:58:59 +01:00
Nikita Popov
2b9acd37f0 Fixed bug #72685 
We currently have a large performance problem when implementing lexers
working on UTF-8 strings in PHP. This kind of code tends to perform a
large number of matches at different offsets on a single string. This
is generally fast. However, if /u mode is used, the full string will
be UTF-8 validated on each match. This results in quadratic runtime.

This patch fixes the issue by adding a IS_STR_VALID_UTF8 flag, which
is set when we have determined that the string is valid UTF8 and
further validation is skipped.

A limitation of this approach is that we can't set the flag for interned
strings. I think this is not a problem for this use-case which will
generally work on dynamic data. If we want to use this flag for other
purposes as well (mbstring?) then it might be worthwhile to UTF-8 validate
strings during interning. But right now this doesn't seem useful.
 2019-03-18 16:58:48 +01:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00