forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Refresh from the upstream #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* PHP-7.1: Update NEWS for 7.1.0beta1
about mbstring or iconv output handler
about mbstring or iconv output handler
…TF chars We must not forget to properly reset the state for multibyte characters following an escape character.
* PHP-5.6: FPM: add test for CVE-2016-5385
* PHP-7.0: FPM: add test for CVE-2016-5385
* PHP-7.1: FPM: add test for CVE-2016-5385
…haracter This has obviously been missed when adding the $escape parameter to SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
# Resolved conflicts: # ext/spl/spl_directory.c
* PHP-7.0: Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
* PHP-7.0: Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
* PHP-7.1: Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements) Update NEWs Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
* PHP-7.0: Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
* PHP-7.1: Update NEWS Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
The test claims that it would be "checking all the values in returned array", but due to the use of %a it actually skipped elements. We fix that by using %s instead.
# Resolved conflicts: # ext/gd/tests/gd_info_variation1.phpt
d28f1da introduced a test regression, due to potentially additional output regarding FreeType support. We fix that by making the test more resilient.
# Resolved conflicts: # ext/gd/tests/gd_info_variation1.phpt
The default path to where an extension is installed should be PHP_PREFIX/ext on windows.
On Windows, Makefile generated by phpize doesn't have the 'test' target rule. This commit fixes that and enables 'nmake test' on Windows.
* PHP-7.0: update NEWS Enable 'nmake test' on building extensions Make phpize use PHP_PREFIX as the default location (windows)
* PHP-7.1: update NeWS update NEWS Enable 'nmake test' on building extensions Make phpize use PHP_PREFIX as the default location (windows)
On Windows, Makefile generated by phpize doesn't have the 'test' target rule. This commit fixes that and enables 'nmake test' on Windows.
The default path to where an extension is installed should be PHP_PREFIX/ext on windows.
* PHP-5.6: update NEWS Make phpize use PHP_PREFIX as the default location (windows) Enable 'nmake test' on building extensions
* PHP-7.0: update NEWS Make phpize use PHP_PREFIX as the default location (windows) Enable 'nmake test' on building extensions
* PHP-7.1: update NEWS Make phpize use PHP_PREFIX as the default location (windows) Enable 'nmake test' on building extensions
While sqlite3.c had already been updated to 3.13.0, the header files had been forgotten.
* PHP-7.1: update NEWS Fixed bug #72658 Locale::lookup() / locale_lookup() hangs if no match found
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.