summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update version for PHP 7.3.6php-7.3.6PHP-7.3.6Christoph M. Becker2019-05-283-4/+4
|
* Update NEWS for 7.3.6 GAChristoph M. Becker2019-05-281-1/+1
|
* Fix bug #77967 - Bypassing open_basedir restrictions via file urisStanislav Malyshev2019-05-282-0/+12
| | | | (cherry picked from commit c34895e837b50213c2bb201c612904342d2bd216)
* Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due ↵Stanislav Malyshev2019-05-284-1/+22
| | | | | | to integer overflow (cherry picked from commit 7cf7148a8f8f4f55fb04de2a517d740bb6253eac)
* Fix #77973: Uninitialized read in gdImageCreateFromXbmChristoph M. Becker2019-05-283-1/+33
| | | | | | | We have to ensure that `sscanf()` does indeed read a hex value here, and bail out otherwise. (cherry picked from commit ed6dee9a198c904ad5e03113e58a2d2c200f5184)
* Fix bug #77988 - heap-buffer-overflow on php_jpg_get16Stanislav Malyshev2019-05-284-0/+17
| | | | (cherry picked from commit 73ff4193be24192c894dc0502d06e2b2db35eefb)
* Merge branch 'PHP-7.2' into PHP-7.3php-7.3.6RC1Dmitry Stogov2019-05-154-20/+27
| | | | | * PHP-7.2: Fixed possible crashes, because of inconsistent PCRE cache and opcache SHM reset
* Prepare 7.3.6RC1Christoph M. Becker2019-05-144-5/+5
|
* Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-05-141-1/+1
|\ | | | | | | | | * PHP-7.2: Fix test case
| * Fix test caseChristoph M. Becker2019-05-141-1/+1
| | | | | | | | | | stderr is supposed to be redirected to NUL (which is roughly equivalent to /dev/null on POSIX), but actually was redirected to a file.
* | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-131-0/+4
|\ \ | |/
| * Add ping to the fpm test for bug #77934Jakub Zelenka2019-05-131-0/+4
| |
* | Fix #78003: strip_tags output change since PHP 7.3Christoph M. Becker2019-05-133-0/+25
| | | | | | | | | | | | | | | | A refactoring of the strip tags state machine[1] missed the special treatment of `depth > 0` when a `>` is encountered in state 2 or 3. We re-add it for BC reasons. [1] <http://git.php.net/?p=php-src.git;a=commit;h=5cf64742773ddbf9af69d962a4d12b567fcf0084>
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-05-133-221/+230
|\ \ | |/
| * Fix #77993: Wrong parse error for invalid hex literal on WindowsTheodore Brown2019-05-134-4201/+4206
| | | | | | | | | | | | | | | | If a PHP file contains an invalid hex literal such as `0x_10`, the expected error is `Parse error: syntax error, unexpected 'x_10' (T_STRING) in %s on line %d`. This already worked correctly on Linux, but on Windows prior to this patch a different error was produced: `Parse error: Invalid numeric literal in %s on line %d`.
* | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2019-05-131-34/+34
|\ \ | |/ | | | | | | * PHP-7.2: Convert CRLF to LF
| * Convert CRLF to LFPeter Kokot2019-05-132-35/+35
| | | | | | | | | | These files are tracked with CRLF line endings in Git and can be converted to LF. Neither are parts of tests or code itself.
* | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-113-1/+46
|\ \ | |/
| * Fix bug #77934 (php-fpm kill -USR2 not working)Jakub Zelenka2019-05-113-1/+46
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2019-05-1137-7037/+7041
|\ \ | |/ | | | | | | * PHP-7.2: Convert CRLF to LF in *.wsdl files
| * Convert CRLF to LF in *.wsdl filesPeter Kokot2019-05-1137-7037/+7041
| | | | | | | | | | These EOL types are part of different environments and not part of the tests themselves.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-05-101-1/+1
|\ \ | |/ | | | | | | * PHP-7.2: Fix typo
| * Fix typoChristoph M. Becker2019-05-101-1/+1
| | | | | | | | | | Since opcache.enable defaults to 1 anyway, this change is only cosmetic.
* | Merge branch 'PHP-7.2' into PHP-7.3George Wang2019-05-093-5/+2
|\ \ | |/
| * Updated LiteSpeed SAPI to 7.3.2 to allow request header value length up to 64K.George Wang2019-05-093-5/+2
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-05-091-4/+7
|\ \ | |/ | | | | | | * PHP-7.2: Fix erroneous assertions
| * Fix erroneous assertionsChristoph M. Becker2019-05-091-4/+7
| | | | | | | | | | | | | | Since PHP strings are binary safe (i.e. they may contain NUL bytes), we must not assume that strlen()/wcslen() actually return the length of the string. Only if the given in_len is zero, it is safe to assert this.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-05-093-20/+48
|\ \ | |/
| * Fixed bug #75186Nikita Popov2019-05-093-21/+48
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-05-091-0/+1
|\ \ | |/ | | | | | | * PHP-7.2: Fix log_verbosity_bug.phpt
| * Fix log_verbosity_bug.phptChristoph M. Becker2019-05-091-0/+1
| | | | | | | | | | This test may fail on Windows due to the file cache fallback. We ensure that this will not happen.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-05-081-3/+2
|\ \ | |/ | | | | | | * PHP-7.2: Add {TMP} placeholder for PHPT INI sections
| * Add {TMP} placeholder for PHPT INI sectionsChristoph M. Becker2019-05-081-3/+2
| | | | | | | | | | | | | | | | | | Several tests use `/tmp` in the `--INI--` section, but this is not portable. We therefore introduce the `{TMP}` placeholder which evaluates to the system's temporary directory using `sys_get_temp_dir()`. We also remove the doubtful `strpos()` optimization.
* | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-05-082-2/+19
|\ \ | |/
| * Fix resolution of "parent" during inheritance checkNikita Popov2019-05-082-2/+19
| | | | | | | | | | We can't assume that the method we're checking against is part of the parent class...
* | Convert CRLF line endings to LFPeter Kokot2019-05-071-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | Merge branch 'PHP-7.2' into PHP-7.3Jakub Zelenka2019-05-051-1/+1
|\ \ | |/
| * Fix OpenSSL online test for ca contextJakub Zelenka2019-05-051-1/+1
| | | | | | | | The php.net is redirected to https so use nginx.org
* | Update `NEWS` with changes made at #4093Javier Spagnoletti2019-05-031-2/+6
| |
* | Add more missing CURL_VERSION_* constantsJavier Spagnoletti2019-05-024-11/+65
| | | | | | | | | | | | | | And also check for CURL_VERSION_* constants in the sync-constants.php script. Related to request #72189: Add missing `CURL_VERSION_*` constants.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-04-301-2/+11
|\ \ | |/ | | | | | | * PHP-7.2: Update NEWS wrt. sec fixes
| * Update NEWS wrt. sec fixesChristoph M. Becker2019-04-301-0/+13
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-04-303-1/+13
|\ \ | |/ | | | | | | * PHP-7.2: Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
| * Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-04-303-1/+13
| |\ | | | | | | | | | | | | * PHP-7.1: Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
| | * Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAGStanislav Malyshev2019-04-304-3/+22
| | | | | | | | | | | | | | | | | | I do not completely understand what is going on there, but I am pretty sure dir_entry <= offset_base if not a normal situation, so we better not to rely on such dir_entry.
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2019-04-291-6/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #77821: Potential heap corruption in TSendMail()
| * | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2019-04-291-6/+7
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #77821: Potential heap corruption in TSendMail()
| | * Fix #77821: Potential heap corruption in TSendMail()Christoph M. Becker2019-04-291-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | `zend_string_tolower()` returns a copy (not a duplicate) of the given string, if it is already in lower case. In this case we must not not `zend_string_free()` both strings. The cleanest solution is to call ` zend_string_release()` on both strings, which properly handles the refcount.
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-04-290-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #77943: imageantialias($image, false); does not work
| * | Fix #77943: imageantialias($image, false); does not workChristoph M. Becker2019-04-292-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, we must not call `gdImageSetAntiAliased()` (which sets the color to anti-alias), but rather modify the `gdImage.AA` flag. Furthermore, we have to actually use the supplied boolean value. We also make sure that we don't attempt to enable anti-aliasing for palette images.
View Lorry Controller Status