summaryrefslogtreecommitdiff
path: root/main
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionChristoph M. Becker2020-02-181-2/+2
|
* Bump versionphp-7.3.15RC1Christoph M. Becker2020-02-041-2/+2
|
* Fix bug #78323: Code 0 is returned on invalid optionsIvan Mikheykin2020-01-272-1/+5
| | | | | Set CLI exit code to 1 when invalid parameters are passed, and print error to stderr.
* Fixed bug #78902liudaixiao2020-01-231-2/+9
|
* Fixed bug #71876Nikita Popov2020-01-171-4/+4
| | | | | | | | | | | This is a backport of fcdc0a6db0ae63fbed9e3828137b899b844623ce to the PHP-7.3 branch. We need to make sure that OnUpdateString is also called for a NULL value, otherwise the reset of the encoding at the end of the request will not work. I believe I already tried to land this before once, but it didn't actually end up on the PHP-7.3 branch due to a push conflict that I only noticed just now.
* Bump versionChristoph M. Becker2020-01-071-3/+3
|
* Next is 7.3.14Christoph M. Becker2019-12-031-3/+3
|
* 7.3.13 is nextChristoph M. Becker2019-11-051-3/+3
|
* Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-10-091-1/+1
|\ | | | | | | | | * PHP-7.2: Fix #78656: Parse errors classified as highest log-level
| * Fix #78656: Parse errors classified as highest log-levelErik Lundin2019-10-091-1/+1
| |
| * next is 7.2.25Remi Collet2019-10-081-3/+3
| |
* | Check for exception after applying stream filtersNikita Popov2019-10-081-1/+7
| | | | | | | | | | | | | | | | This makes the stream opening actually fail, and avoids assertion failures when we tokenize with EG(exception) set. Also avoid throwing an additional warning after an exception has already been thrown.
* | 7.3.12 is nextChristoph M. Becker2019-10-081-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Joe Watkins2019-10-032-6/+0
|\ \ | |/ | | | | | | * PHP-7.2: Fix #76859 stream_get_line skips data if used with data-generating filter
| * Fix #76859 stream_get_line skips data if used with data-generating filterKonstantin Kopachev2019-10-032-6/+0
| | | | | | | | | | | | | | | | | | stream_get-line repeatedly calls php_stream_fill_read_buffer until enough data is accumulated in buffer. However, when stream contains filters attached to it, then each call to fill buffer essentially resets buffer read/write pointers and new data is written over old. This causes stream_get_line to skip parts of data from stream This patch fixes such behavior, so fill buffer call will append.
| * Bump for 7.2.24Sara Golemon2019-09-101-3/+3
| |
* | PHP 7.3.10RC1 has been taggedChristoph M. Becker2019-09-101-3/+3
| |
* | Fix versionChristoph M. Becker2019-09-091-3/+3
| | | | | | | | 7.3.10 is next, not 7.3.11.
* | fix versionStanislav Malyshev2019-09-051-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-08-301-2/+2
|\ \ | |/
| * Fixed bug #78469Sergei Turchanov2019-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcgi_accept_request function is supposed to call a FastCGI implementation's on_accept hook when entering an "accepting" stage (that is right before calling "accept"). This hook implementation (fpm_request_accepting) updates a worker state to an "accepting" state which is effectively an "Idle" state, and updates counters on the scoreboard of the corresponding pool (idle++, active--). But this is not done when listening for client connections on a named pipe on Windows platform. In that case a combination of ConnectNamedPipe/WaitForSingleObject is used (to be able to catch in_shutdown as far as I understand), but it is nonetheless functionally equivalent to "accept" call. Also by not calling on_hook neither a worker's state is updated to "accepting" state nor scoreboard counters are updated.
| * Bump for 7.2.23Sara Golemon2019-08-131-3/+3
| |
* | Update Oniguruma to 6.9.1Stanislav Malyshev2019-08-251-3/+3
| |
* | Next will be 7.3.10Christoph M. Becker2019-08-131-3/+3
| |
* | Bump version numbersChristoph M. Becker2019-08-131-3/+3
| | | | | | | | This should have been done four weeks ago already.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-291-1/+6
|\ \ | |/
| * Fix bug #78326Albert Casademont2019-07-291-1/+6
| | | | | | | | | | Similar to what fread() does, truncate the stream_get_contents() result if the original buffer was way too large.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-291-0/+5
|\ \ | |/
| * Fix Zend signals unblockingNikita Popov2019-07-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-171-9/+6
|\ \ | |/
| * Fixed bug #69100Nikita Popov2019-07-171-9/+6
| |
| * next is 7.2.22Remi Collet2019-07-161-3/+3
| |
| * next is 7.2.21Remi Collet2019-06-111-3/+3
| |
| * Bump for 7.2.20Sara Golemon2019-05-141-3/+3
| |
| * next is 7.2.19Remi Collet2019-04-161-3/+3
| |
* | Add syslog.filter=rawErik Lundin2019-06-173-0/+12
| | | | | | | | | | This passes through syslog message unchanged, without splitting messages at newlines.
* | Next is 7.3.8Christoph M. Becker2019-06-111-3/+3
| |
* | Prepare 7.3.7-devChristoph M. Becker2019-05-141-3/+3
| |
* | Prepare main branch for PHP 7.3.6Christoph M. Becker2019-04-161-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-04-151-0/+2
|\ \ | |/
| * Zero sockaddr structNikita Popov2019-04-151-0/+2
| | | | | | | | | | in6 has a bunch of extra fields that we're leaving uninitialized. I don't see them locally, but there's valgrind warnings on gcov.
| * Bump versions for 7.2.18Sara Golemon2019-03-191-3/+3
| |
* | Prepare main branch for PHP 7.3.5Christoph M. Becker2019-03-191-3/+3
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-03-041-18/+35
|\ \ | |/ | | | | | | * PHP-7.2: Fix bug #77630 - safer rename() procedure
| * Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-03-041-18/+35
| |\ | | | | | | | | | | | | * PHP-7.1: Fix bug #77630 - safer rename() procedure
| | * Fix bug #77630 - safer rename() procedureStanislav Malyshev2019-03-041-17/+34
| | | | | | | | | | | | | | | | | | | | | In order to rename safer, we do the following: - set umask to 077 (unfortunately, not TS, so excluding ZTS) - chown() first, to set proper group before allowing group access - chmod() after, even if chown() fails
| | * Bump for 7.1.27Sara Golemon2019-01-081-3/+3
| | |
| | * Prep for 7.1.26Sara Golemon2018-11-211-3/+3
| | |
| | * bump versionsJoe Watkins2018-10-241-3/+3
| | |
| | * Sync leading and final newlines in source code filesPeter Kokot2018-10-142-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2