php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 06:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
116,083 Commits 547 Branches 1,483 Tags
f7c61c070f76f8ebfefdf0210a3f7ea3501cde1a
Commit Graph

116083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
f7c61c070f Add ext/sodium arginfo stubs 2019-10-21 10:19:57 +02:00
Joe Watkins
174ab25fd4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:25:24 +02:00
Joe Watkins
1ac961bea8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:24:41 +02:00
Joe Watkins
1c9b62fbd4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:23:26 +02:00
Fabien Villepinte
bea2ff88c9 Fix bug #78697: inaccurate error message 2019-10-21 09:22:09 +02:00
Stanislav Malyshev
c797ed5cc7 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78633: Heap buffer overflow (read) in mb_eregi
 2019-10-20 23:20:26 -07:00
Stanislav Malyshev
d517c559fc Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78633: Heap buffer overflow (read) in mb_eregi
 2019-10-20 23:20:16 -07:00
Christoph M. Becker
4f50d58cab Fix #78633: Heap buffer overflow (read) in mb_eregi 
We backport kkos/oniguruma@15c4228aa2.
 2019-10-20 22:47:38 -07:00
Jakub Zelenka
878f8b0b23 Merge branch 'PHP-7.4' 2019-10-20 16:59:30 +01:00
Jakub Zelenka
666fb9a194 Add NEWS for the fixed bug #74083 2019-10-20 16:58:13 +01:00
Maksim Nikulin
d537ae73e0 Skip fpm bug #74083 test on Windows 
Have not expected side effects of `include`.
 2019-10-20 16:08:55 +01:00
Maksim Nikulin
2f9f409156 Add (slow) test for fpm concurrent reloads #74083 2019-10-20 16:08:55 +01:00
Maksim Nikulin
ae5154c6c6 Block signals during fpm master initialization 
Fix PHP-FPM failure in the case of concurrent reload attempts.

Postpone signal delivery to the fpm master process till proper signal
handlers are set. Prevent the following case:

- Running master process receives `SIGUSR2` and performs `execvp()`.
- Another `SIGUSR2` is arrived before signal handlers are set.
- Master process dies.
- Requests to the HTTP server handled by PHP-fpm can not be served
  any more.

Block some signals using `sigprocmask()` before `execvp()` and early
in the `main()` function. Unblock signals as soon as proper
handlers are set.

Fixes bug #74083
 2019-10-20 16:08:55 +01:00
Fabien Villepinte
cdacad8e50 Merge branch 'PHP-7.4' 2019-10-20 10:57:31 +02:00
Fabien Villepinte
62b053a3be Improve the error message in timeout tests 
Closes GH-4818.
 2019-10-20 10:55:27 +02:00
Fabien Villepinte
08b7279036 Merge branch 'PHP-7.4' 2019-10-19 22:12:18 +02:00
Fabien Villepinte
4b3e041f5b Fix proto of enchant_broker_list_dicts() 2019-10-19 22:11:34 +02:00
Christoph M. Becker
0436bc875e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix miscellaneous typos in docs
 2019-10-19 19:20:25 +02:00
Tyson Andre
38f388fba4 Fix miscellaneous typos in docs 2019-10-19 19:19:28 +02:00
Fabien Villepinte
23f3b54906 Merge branch 'PHP-7.4' 2019-10-19 15:44:57 +02:00
Fabien Villepinte
550a2df043 Add tests for DOMEntityReference 2019-10-19 15:42:16 +02:00
Christoph M. Becker
284e993791 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78684: PCRE bug72463_2 test is sending emails on Linux
 2019-10-19 12:59:59 +02:00
Christoph M. Becker
26635ed71a Fix #78684: PCRE bug72463_2 test is sending emails on Linux 
This test is not supposed to run on non Windows systems; otherwise it
would try to send an email.
 2019-10-19 12:59:32 +02:00
Christoph M. Becker
b00cc3378c Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:52:38 +02:00
Christoph M. Becker
ee6a71ca73 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:51:05 +02:00
Christoph M. Becker
ce035dc4a0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:49:18 +02:00
Christoph M. Becker
45a7723267 Fix #78694: Appending to a variant array causes segfault 
`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.
 2019-10-19 11:47:00 +02:00
Nikita Popov
49327e2e15 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Improve exif tag name fetching
  Implement a cache for exif tag name lookups
  Limit the amount of errors generated during exif parsing
 2019-10-18 16:55:46 +02:00
Nikita Popov
650115c827 Improve exif tag name fetching 2019-10-18 16:55:05 +02:00
Nikita Popov
56e3e6f135 Implement a cache for exif tag name lookups 2019-10-18 16:54:56 +02:00
Nikita Popov
e5324a2484 Limit the amount of errors generated during exif parsing 
Emitting errors is fairly expensive, to the point that parsing
a file with a huge number of invalid tags can take seconds.
Generating ten thousand errors is unlikely to help anybody, but
constitutes a potential DOS vector.
 2019-10-18 16:54:49 +02:00
Christoph M. Becker
43a1363a05 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test case
 2019-10-18 16:24:14 +02:00
Christoph M. Becker
81806db90b Fix test case 
Cf. <https://github.com/php/php-src/pull/4687>.
 2019-10-18 16:23:56 +02:00
Christoph M. Becker
2484f1e88a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:33:58 +02:00
Christoph M. Becker
197568d634 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:33:25 +02:00
Christoph M. Becker
c7c7ab53ac Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:32:08 +02:00
m.yakunin
d2cde0bfd3 Fix #70153 \DateInterval incorrectly unserialized 
Added a separate macro for reading 'days' property, so that bool(false)
is correctly converted to the proper internal representation.
 2019-10-18 15:31:14 +02:00
Christoph M. Becker
ecc9588d0c Properly handle non resources passed to socket_select() 
As of PHP 8.0.0, failing `zend_fetch_resource_ex()` throws a TypeError,
so we cannot simply skip non resources in the `$read`, `$write` and
`$except` arrays.  Instead we bail out.  Since these arrays are already
checked in `php_sock_array_to_fd_set()`, we remove the additional check
in `php_sock_array_from_fd_set()`.
 2019-10-18 14:16:25 +02:00
Christoph M. Becker
04d5086578 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update array access syntax deprecated
 2019-10-17 23:40:30 +02:00
Alex Porto dos Santos
a6a2d167d8 Update array access syntax deprecated 
Update array access syntax deprecated in line 175 and 204
Deprecated: Array and string offset access syntax with curly braces is deprecated in /home/alex/php/hello/ext_skel.php on line 175
Deprecated: Array and string offset access syntax with curly braces is deprecated in /home/alex/php/hello/ext_skel.php on line 204
 2019-10-17 23:39:55 +02:00
Dmitry Stogov
605e0de357 Clenup "smart branch" handling 2019-10-18 00:11:30 +03:00
Dmitry Stogov
65c4cc231d Fixed wrong shift 2019-10-17 23:31:47 +03:00
Nikita Popov
e80934d747 Pass cache slot when printing type errors 
Instead of using a separate ce.
 2019-10-17 17:06:48 +02:00
Nikita Popov
9a634a9c6b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Integrate property types with variance system
 2019-10-17 13:42:47 +02:00
Nikita Popov
cf85eb2468 Integrate property types with variance system 
Property types are invariant, but may still have to load classes in
order to check for class aliases. This class loading should follow
the same rules as all other variance checks, rather than just
loading unconditionally.

This change integrates property type invariance checks into the
variance system as a new obligation type, and prevent early binding
if the type check cannot be performed.
 2019-10-17 13:37:04 +02:00
Dmitry Stogov
3df64af965 Relay on DO_ICALL/DO_UCALL opcode to avoid generation of useless code 2019-10-17 12:55:36 +03:00
Dmitry Stogov
3a88c5b87a Fixed exception handling 2019-10-16 22:38:01 +03:00
Fabien Villepinte
86c33b8ddd Merge branch 'PHP-7.4' 2019-10-16 20:53:52 +02:00
Fabien Villepinte
8b160f530c Change port to avoid collision with others tests 
The 64321 port is already used with the ext/openssl tests.
 2019-10-16 20:50:54 +02:00
Dmitry Stogov
5431837a6c Clenup "smart branch" handling 2019-10-16 12:28:30 +03:00