clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,944 Commits 491 Branches 1,363 Tags 836 MiB
e1934f8515
Commit Graph

109944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
e1934f8515 Merge branch 'PHP-7.2' into PHP-7.3 2019-08-02 10:35:48 +02:00
Nikita Popov
85e8ccd55e Fixed bug #78363 2019-08-02 10:35:24 +02:00
Christoph M. Becker
b419b24ead Remove upgrade-pcre.php script 
This script has not been updated for PCRE2, and it's mostly useless
anyway.  Therefore we remove it altogether.
 2019-08-01 10:49:05 +02:00
Christoph M. Becker
8af14024c2 Fix 78213: Empty row pocket 
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
 2019-07-31 18:05:40 +02:00
Christoph M. Becker
ef439abd46 Add security related NEWS entries [ci skip] 2019-07-30 09:49:39 +02:00
Remi Collet
6ea13baaf1 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add security NEW entries + reorder [ci skip]
 2019-07-30 09:27:06 +02:00
Remi Collet
b29ecec4ef add security NEW entries + reorder [ci skip] 2019-07-30 09:26:50 +02: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
Stanislav Malyshev
d69894734d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:20:44 -07:00
Stanislav Malyshev
284fb08fdc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:19:16 -07:00
Christoph M. Becker
cd1101e8c8 Fix #77919: Potential UAF in Phar RSHUTDOWN 
We have to properly clean up in case phar_flush() is failing.

We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
 2019-07-29 13:18:27 -07:00
Stanislav Malyshev
42e8b85d94 Update NEWS 2019-07-29 13:16:53 -07:00
Nikita Popov
44fe025c28 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 17:34:16 +02:00
Albert Casademont
dc7aa22b18 Fix bug #78326 
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
 2019-07-29 17:33:57 +02:00
Nikita Popov
bbed5564eb Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 16:57:57 +02:00
Nikita Popov
38f1288b64 Fix Zend signals unblocking 
There are a few parts here:
 * opcache should not be blocking signals while invoking compile_file,
   otherwise signals may remain blocked on a compile error. While at
   it, also protect SHM memory during compile_file.
 * We should deactivate Zend signals at the end of the request, to make
   sure that we gracefully recover from a missing unblock and signals
   don't remain blocked forever.
 * We don't use a critical section in deactivation, because it should
   not be necessary. Additionally we want to clean up the signal queue,
   if it is non-empty.
 * Enable SIGG(check) in debug builds so we notice issues in the future.
 2019-07-29 15:17:32 +02:00
Christoph M. Becker
76683ea999 Update NEWS [ci skip] 
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
 2019-07-29 14:48:23 +02:00
Nikita Popov
8e63bb5e46 Fixed bug #78341 
The smart branch logic assumed b->start refers to the old offsets,
while b->start was already adjusted to the new offsets at this
point. Delay the change until later.
 2019-07-29 13:02:01 +02:00
Nikita Popov
552ce9c763 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 11:27:34 +02:00
Nikita Popov
68fd435ba8 Fixed bug #78333 
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
 2019-07-29 11:27:21 +02:00
Nikita Popov
727929765b Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 11:26:09 +02:00
Nikita Popov
d142dfc93d Fixed bug #78333 
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
 2019-07-29 11:25:27 +02:00
Stanislav Malyshev
aeb6d13185 Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment) 2019-07-29 00:53:37 -07:00
Stanislav Malyshev
dea2989ab8 Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail) 2019-07-29 00:53:28 -07:00
Christoph M. Becker
585131f901 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78342: Bus error in configure test for iconv //IGNORE
 2019-07-29 08:50:39 +02:00
Christoph M. Becker
30eb4b3563 Fix #78342: Bus error in configure test for iconv //IGNORE 
We have to check the return value of iconv_open() for error, to avoid
that and potentially other undesired behavior of iconv().
 2019-07-29 08:48:13 +02:00
Levi Morrison
c624a7fe43 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Remove .post files only for passing tests
 2019-07-25 09:49:18 -06:00
Levi Morrison
5649267b25 Remove .post files only for passing tests 
This allows the sh script for failing tests with --POST-- to work
 2019-07-25 09:48:39 -06:00
Peter Kokot
b42a13b08a Update NEWS 2019-07-23 02:13:36 +02:00
Peter Kokot
9e2ac14702 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
 2019-07-23 02:13:12 +02:00
Peter Kokot
8f384bea93 Update NEWS 2019-07-23 02:13:00 +02:00
Nikita Popov
b59a9381b9 Remove test for bug #77185 
Seems to be very unreliable in CI.
 2019-07-22 12:40:26 +02:00
Nikita Popov
5e4dbce586 Reduce number of workers in test 
4 seems to be enough to reliably reproduce the issue. Let's see
if this works better in CI.
 2019-07-22 11:18:38 +02:00
Maksim Nikulin
bdf24f8d6d Prevent use after free in fpm_event_epoll_wait 
epoll event backend does not guarantee that child input/output events
are reported before SIGCHILD due to finished worker. While a bunch of
events received by epoll is being processed, child-related structures
may be removed before dispatching of an I/O event for the same child.
The result may be attempt to access to memory region allocated for
another purpose, segfault of the master process, and unavailable web
sites.

Postpone processing of SIGCHILD events till other events in the same
bunch are processed.

Fix Bug #62418 php-fpm master process crashes
Fix Bug #65398 Race condition between SIGCHLD and child stdout/stderr event leads to segfault
Fix Bug #75112 php-fpm crashing, hard to reproduce
Fix Bug #77114 php-fpm master segfaults in fpm_event_epoll_wait/fpm_event_fire
Fix Bug #77185 Use-after-free in FPM master event handling
 2019-07-22 10:32:58 +02:00
George Wang
82f35ab089 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-21 00:01:06 -04:00
George Wang
eb7e45f662 Checked in LiteSpeed SAPI 7.5, addressed two main problems in "clean shutdown" introduced in 7.4.3, 
1. falls in an infinite loop because PHP engine's inconsistent state, now override the ITIMER_PROF to 0.1 second, clean shutdown must finish before that.
2. generate too much error log, we completely disable "error_reporting" before calling php_request_shutdown().
 2019-07-20 23:59:43 -04:00
Nikita Popov
4a9f78f9d7 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-18 14:41:35 +02:00
Abyr Valg
c8c183eb62 Fixed bug #77946 
Save multi_info_read() result into easy handle.
 2019-07-18 14:40:47 +02:00
Nikita Popov
79efd55fc3 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-17 15:59:14 +02:00
Nikita Popov
b864abfe23 Fixed bug #69100 2019-07-17 15:58:29 +02:00
George Peter Banyard
e7e66d5275 Convert short tag to standard tag in Zend test file 
Closes GH-4389.

(cherry picked from commit e6c2b28865)
 2019-07-16 15:27:50 +02:00
Christoph M. Becker
956ecc2ce5 Update NEWS [ci skip] 2019-07-16 13:44:13 +02:00
Remi Collet
344d01bee3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  move NEWS entry [ci skip]
 2019-07-16 13:00:30 +02:00
Remi Collet
bd0514913b move NEWS entry [ci skip] 2019-07-16 13:00:13 +02:00
Nikita Popov
eea9d61763 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-16 11:10:51 +02:00
Nikita Popov
8a19fe29de Fixed bug #78297 2019-07-16 11:09:17 +02:00
Remi Collet
bf1ace7dd3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  next is 7.2.22
 2019-07-16 10:39:03 +02:00
Remi Collet
c9037421ac next is 7.2.22 2019-07-16 10:38:20 +02:00
Dmitry Stogov
c570980175 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed incorrect specialization (missed IS_INDIRECT handling)
 2019-07-16 01:52:11 +03:00
Dmitry Stogov
9ccf3fb996 Fixed incorrect specialization (missed IS_INDIRECT handling) 2019-07-16 01:50:10 +03:00