archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Use e.g. instead of less common f.e. [ci skip]
This commit is contained in:
Peter Kokot 2019-07-09 17:53:57 +02:00
commit cbefc538fa
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
docs/release-process.md
View file

@ -112,10 +112,10 @@
10. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`, 10. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
`configure.ac` and `NEWS` in the *main* branch (PHP-7.4 for example) to `configure.ac` and `NEWS` in the *main* branch (PHP-7.4 for example) to
prepare for the **next** version. F.e. if the RC is "7.4.1RC1" then the new prepare for the **next** version. For example, if the RC is "7.4.1RC1" then
one should be `7.4.2-dev` - regardless if we get a new RC or not. This is to the new one should be `7.4.2-dev` - regardless if we get a new RC or not.
make sure `version_compare()` can correctly work. Commit the changes to the This is to make sure `version_compare()` can correctly work. Commit the
main branch. changes to the main branch.
11. Push the changes to the main repo, the tag, the main branch and the release 11. Push the changes to the main repo, the tag, the main branch and the release
branch. Release branches for alpha/beta/.0RCx releases before to GA release branch. Release branches for alpha/beta/.0RCx releases before to GA release
@ -139,7 +139,7 @@
have this directory, create it. have this directory, create it.
15. Now the RC can be found on https://downloads.php.net/~yourname, 15. Now the RC can be found on https://downloads.php.net/~yourname,
f.e. https://downloads.php.net/~derick/. e.g. https://downloads.php.net/~derick/.
16. Once the release has been tagged, contact the release-managers@ distribution 16. Once the release has been tagged, contact the release-managers@ distribution
list so that Windows binaries can be created. Once those are made, they can list so that Windows binaries can be created. Once those are made, they can
@ -204,7 +204,7 @@
`Zend/zend.h`, `configure.ac` and possibly `NEWS`. `Zend/zend.h`, `configure.ac` and possibly `NEWS`.
2. If a CVE commit needs to be merged to the release, then have it committed to 2. If a CVE commit needs to be merged to the release, then have it committed to
the base branches and merged upwards as usual (f.e commit the CVE fix to the base branches and merged upwards as usual (e.g. commit the CVE fix to
7.2, merge to 7.3, 7.4 etc...). Then you can cherry-pick it in your release 7.2, merge to 7.3, 7.4 etc...). Then you can cherry-pick it in your release
branch. Don't forget to update `NEWS` manually in an extra commit then. branch. Don't forget to update `NEWS` manually in an extra commit then.
@ -219,9 +219,9 @@
6. Check `./sapi/cli/php -v` output for version matching. 6. Check `./sapi/cli/php -v` output for version matching.
7. Tag the repository with the version f.e. `git tag -u YOURKEYID php-7.4.1` 7. Tag the repository with the version e.g. `git tag -u YOURKEYID php-7.4.1`
8. Push the tag f.e. `git push origin php-7.4.1`. 8. Push the tag e.g. `git push origin php-7.4.1`.
9. Run: `./scripts/dev/makedist php-7.4.1`, this will export the tag, 9. Run: `./scripts/dev/makedist php-7.4.1`, this will export the tag,
create configure and build three tarballs (gz, bz2 and xz). Check if the create configure and build three tarballs (gz, bz2 and xz). Check if the
@ -289,7 +289,7 @@
5. Update the ChangeLog file for the given major version 5. Update the ChangeLog file for the given major version
f.e. `ChangeLog-7.php` from the `NEWS` file e.g. `ChangeLog-7.php` from the `NEWS` file
* Go over the list and put every element on one line. * Go over the list and put every element on one line.
* Check for `&`, `<` and `>` and escape them if necessary. * Check for `&`, `<` and `>` and escape them if necessary.
@ -319,7 +319,7 @@
8. **Check website has been synced before announcing or pushing news** 8. **Check website has been synced before announcing or pushing news**
Try, f.e. https://www.php.net/distributions/php-7.4.0.tar.xz Try, e.g. https://www.php.net/distributions/php-7.4.0.tar.xz
Website may update slowly (may take an hour). Website may update slowly (may take an hour).

2
ext/gd/libgd/gd_interpolation.c
View file

@ -2117,7 +2117,7 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
{ {
/* round to two decimals and keep the 100x multiplication to use it in the common square angles /* round to two decimals and keep the 100x multiplication to use it in the common square angles
case later. Keep the two decimal precisions so smaller rotation steps can be done, useful for case later. Keep the two decimal precisions so smaller rotation steps can be done, useful for
slow animations, f.e. */ slow animations. */
const int angle_rounded = fmod((int) floorf(angle * 100), 360 * 100); const int angle_rounded = fmod((int) floorf(angle * 100), 360 * 100);
if (bgcolor < 0) { if (bgcolor < 0) {

4
ext/odbc/config.m4
View file

@ -291,8 +291,8 @@ PHP_ARG_WITH([custom-odbc],,
[AS_HELP_STRING([[--with-custom-odbc[=DIR]]], [AS_HELP_STRING([[--with-custom-odbc[=DIR]]],
[Include user defined ODBC support. DIR is ODBC install base directory [Include user defined ODBC support. DIR is ODBC install base directory
[/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and have some odbc.h in [/usr/local]. Make sure to define CUSTOM_ODBC_LIBS and have some odbc.h in
your include dirs. f.e. you should define following for Sybase SQL Anywhere your include dirs. For example, you should define following for Sybase SQL
5.5.00 on QNX, prior to running this configure script: Anywhere 5.5.00 on QNX, prior to running this configure script:
CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix
CUSTOM_ODBC_LIBS="-ldblib -lodbc"])]) CUSTOM_ODBC_LIBS="-ldblib -lodbc"])])