mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
109,970 Commits 500 Branches 1,381 Tags 813 MiB
5536105b67
Commit Graph

109970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikita Popov
2d737a1e4b Merge branch 'PHP-7.2' into PHP-7.3 2019-07-15 15:20:15 +02:00
Nikita Popov
88ffe05797 Fix bug #77124 
This is a backport of 6fcae63f61
to PHP 7.2.
 2019-07-15 15:19:31 +02:00
Remi Collet
ad48464ec2 typo [ci skip] 2019-07-15 14:17:13 +02:00
Remi Collet
590d8f8263 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78269 password_hash uses weak options for argon2
 2019-07-15 14:11:38 +02:00
Remi Collet
a7ff3a6483 Fix #78269 password_hash uses weak options for argon2 2019-07-15 14:11:30 +02:00
Remi Collet
eab0079c90 Fix #78269 password_hash uses weak options for argon2 2019-07-15 14:10:38 +02:00
Nikita Popov
193f28c7d5 Fixed bug #78010 
Prevent the gc_info from becoming all zero for a registered root
by setting the top bit to one for compressed root addresses.
 2019-07-15 12:00:30 +02:00
Nikita Popov
3eb057c4a7 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-15 10:23:51 +02:00
Andrew Collington
768ad70f70 Fix bug #78291 Missing opcache directives 
New opcache directives have been added recently which are returned
if using `ini_get_all('zend opcache')` but are not listed in the
directives if using `opcache_get_configuration()`.  This fix adds
those missing directives as well as if `opcache.mmap_base` is used
instead of `opcache.lockfile_path`.  Also adds a test to ensure the
directives match with both methods of fetching.
 2019-07-15 10:22:47 +02:00
Nikita Popov
3f73916f10 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-12 16:51:47 +02:00
Nikita Popov
a7de2af46c Use TRY_ADDREF/TRY_DELREF in soap 
The DELREF part is a possible fix for bug #78278, the ADDREF part
is a drive-by fix.
 2019-07-12 16:50:43 +02:00
Nikita Popov
9d141f9889 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-12 16:30:33 +02:00
Nikita Popov
4a91f66b8f Fixed bug #78279 
Even if we don't initialize the callback on every request, we
should still reset our globals to default values...
 2019-07-12 16:29:18 +02:00
Christoph M. Becker
fa65f5ecf5 Fix #78212: Segfault in built-in webserver 
Since syslog's ident and facility parameters have been added to
config[1], vsyslog() segfaults on Windows, if openlog() has not been
called before.  We bring back the removed lines to fix this.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=2475337bd8a0fad0dac03db3f5e7e9d331d53653>
 2019-07-11 13:09:54 +02:00
Nikita Popov
e7a83ec8df Fix bug #78271 
When cleaning nops in the dfa pass, we were always keeping the
smart branch inhibiting nop that occurs directly before the jump
instruction. However, as we skip unreachable blocks entirely, it
may happen that we need to keep a nop that occurs further back,
prior to the unreachable blocks. Account for that case now.

We should really do something about the smart branch situation,
this is very fragile...
 2019-07-10 17:25:40 +02:00
Nikita Popov
3fa9f9cfae Add CONFLICTS to recognized sections 
It does nothing on 7.3, but this makes it easier to write tests in
3rd party extensions.
 2019-07-10 13:09:06 +02:00
Nikita Popov
825f47564a Merge branch 'PHP-7.2' into PHP-7.3 2019-07-09 11:05:18 +02:00
Nikita Popov
22ed362810 Revert "Fixed bug #76980" 
This reverts commit 35353dc49a.

This changes causes issues for Symfony, see
https://github.com/symfony/symfony/issues/32395. I'm reverting it
from PHP 7.2 and PHP 7.3 and only leaving it in PHP 7.4.
 2019-07-09 11:04:16 +02:00
Christoph M. Becker
7404d756e9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Upgrade to SQLite 3.28.0
 2019-07-09 10:04:41 +02:00
Christoph M. Becker
40f7533cc1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Upgrade to SQLite 3.28.0
 2019-07-09 10:02:47 +02:00
Christoph M. Becker
e944ae6b2a Upgrade to SQLite 3.28.0 
Over the years, multiple security vulnerabilities[1] have been found
and fixed in SQLite3, so it makes sense to update our bundled libsqlite
to the latest available version.

[1] <https://www.cvedetails.com/vulnerability-list/vendor_id-9237/Sqlite.html>
 2019-07-09 09:59:46 +02:00
Peter Kokot
4fcf8e9385 Update NEWS [ci skip] 2019-07-08 18:48:50 +02:00
Peter Kokot
ed4aa4b624 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS [ci skip]
 2019-07-08 18:48:27 +02:00
Peter Kokot
f81be1aff6 Update NEWS [ci skip] 2019-07-08 18:47:55 +02:00