php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
116,100 Commits 547 Branches 1,481 Tags
6bef57f2e27239ceb88d2dc3a44fbecb7cdfe8e7
Commit Graph

116100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
6bef57f2e2 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:32 -07:00
Stanislav Malyshev
59953efc09 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:27 -07:00
Stanislav Malyshev
57b4dcbe77 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:19 -07:00
Stanislav Malyshev
4b5cdda0c7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:09 -07:00
Fabien Villepinte
084d401beb Merge branch 'PHP-7.4' 2019-10-21 21:33:30 +02:00
Fabien Villepinte
7ce85c34ff Revert "Add tests for ReflectionZendExtension" 
This reverts commit 4194e0415b.

There were already tests for this class.
 2019-10-21 21:31:36 +02:00
Fabien Villepinte
95390972f1 Merge branch 'PHP-7.4' 2019-10-21 21:17:50 +02:00
Fabien Villepinte
4194e0415b Add tests for ReflectionZendExtension 2019-10-21 21:17:16 +02:00
Dmitry Stogov
42f4bdba2a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #78512 (Cannot make preload work)
 2019-10-21 14:53:03 +03:00
Dmitry Stogov
05c5e5dfde Fixed bug #78512 (Cannot make preload work) 2019-10-21 14:52:26 +03:00
Nikita Popov
d927b745d6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix static prop cleanup for dl'ed internal classes
 2019-10-21 12:17:43 +02:00
Nikita Popov
3d55386aa8 Fix static prop cleanup for dl'ed internal classes 2019-10-21 12:17:38 +02:00
Nikita Popov
065d00f241 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix leak with cycle in static prop of internal class
 2019-10-21 10:27:35 +02:00
Nikita Popov
ed31e04133 Fix leak with cycle in static prop of internal class 
More the cleanup of interned classes before the final GC run,
just like it is done for user classes.
 2019-10-21 10:26:10 +02:00
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
Jakub Zelenka
ab061f95ca Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) 2019-10-20 22:50:04 -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