1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

113403 Commits

Author SHA1 Message Date
Nikita Popov eabb8a6324 Skip syntax errors in skipif conditions 2019-06-12 15:56:38 +02:00
Nikita Popov b277548ed5 Fix two 32-bit tests for zpp changes 2019-06-12 15:47:42 +02:00
Nikita Popov 859e3f36f9 Merge branch 'PHP-7.4' 2019-06-12 15:40:23 +02:00
Nikita Popov 7b8299893e Fix ext/exif/tests/bug76557.phpt for 32-bit builds
The error message is different there.
2019-06-12 15:40:18 +02:00
Nikita Popov 5ae158a004 Merge branch 'PHP-7.4' 2019-06-12 15:28:41 +02:00
Nikita Popov bc8fece0cf Don't warn if libcurl SSL library not detected
libcurl may link against 7 different ssl libraries, all of which
are thread-safe -- apart from openssl, of course. We check for
openssl and register locking callbacks in that case, but we should
not warn if any other library is used.
2019-06-12 15:26:50 +02:00
Joe Watkins e1f65e2d97 Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4 2019-06-12 15:10:49 +02:00
Joe Watkins d2a1e84610 Merge branch 'PHP-7.4'
* PHP-7.4:
  we are not running database tests on macos, there is no need to install mysql or start pg
2019-06-12 15:10:28 +02:00
Joe Watkins 3b6d36435f we are not running database tests on macos, there is no need to install mysql or start pg 2019-06-12 15:09:41 +02:00
Joe Watkins a7f8a2b731 we are not running database tests on macos, there is no need to install mysql or start pg 2019-06-12 15:09:28 +02:00
Nikita Popov 171938bc6a Merge branch 'PHP-7.4' 2019-06-12 15:04:16 +02:00
Nikita Popov 6fcb469991 Fix unsigned char mismatch 2019-06-12 14:58:06 +02:00
Nikita Popov 8f63e7e324 Make ATTRIBUTE_UNUSED more portable 2019-06-12 14:29:23 +02:00
Nikita Popov 89df091529 Merge branch 'PHP-7.4' 2019-06-12 13:50:48 +02:00
Nikita Popov cc89d26096 Fix ifdef position
Hopefully fixes the release build...
2019-06-12 13:50:30 +02:00
Nikita Popov cdefeb715b Use memset instead of brace initialization
Apparently {{0}} is not enough ... let's not rely on structure
layout specifics here.
2019-06-12 13:50:23 +02:00
Derick Rethans 650e499839 Merge branch 'PHP-7.4' 2019-06-12 12:42:06 +01:00
Derick Rethans 945e5d35d7 Update NEWS for 7.4.0alpha2 2019-06-12 12:24:35 +01:00
Derick Rethans ec57ba5edd Update CREDITS for PHP 7.4.0alpha1 2019-06-12 12:24:35 +01:00
Derick Rethans 53bfa33ef5 Update NEWS for PHP 7.4.0alpha1 2019-06-12 12:24:35 +01:00
Nikita Popov eea206a06c Merge branch 'PHP-7.4' 2019-06-12 13:18:04 +02:00
Nikita Popov 65ff4dddba Remove always true condition 2019-06-12 13:17:25 +02:00
Nikita Popov 080e2316cf Mark some operand fetching funs as ATTRIBUTE_UNUSED
Whether these are used depends on VM specialization.
2019-06-12 13:17:25 +02:00
Nikita Popov 16f79129c7 Fix unused variables in fpm_env.c 2019-06-12 13:17:25 +02:00
Nikita Popov 93c728b77c Try to control ZEND_MM_ALIGNED_SIZE type 2019-06-12 13:17:25 +02:00
Nikita Popov be36d92294 Fix unused value warnings in snprintf.c 2019-06-12 13:17:25 +02:00
Nikita Popov 52d80ccd24 Remove MYSQLND_LLU_SPEC/MYSQLND_LL_SPEC
No longer used, replaced by PRIu64/PRIi64.
2019-06-12 13:17:25 +02:00
Nikita Popov e1e275eefd Fix mysqlnd printf modifiers
By moving the the standard macros...
2019-06-12 13:17:25 +02:00
Nikita Popov 4d65d53805 Enable -Werror on m32 build
This one is clean now.
2019-06-12 13:17:25 +02:00
Nikita Popov 3e4b9659d3 Fix warnings in mysqlnd_alloc.c
And also separate the PHP_DEBUG codepaths more, to avoids having an
ifdef every other line...
2019-06-12 13:17:25 +02:00
Nikita Popov 9fa552f393 Fix incorrect enum value uses in xmlrpc 2019-06-12 13:17:25 +02:00
Nikita Popov fdfb390f07 Remove unused php_mbX_int_to_char() functions 2019-06-12 13:17:25 +02:00
Nikita Popov 5be772a19c Fix incorrect printf modifiers 2019-06-12 13:17:25 +02:00
Nikita Popov 2134cc25d2 Guard functions by SO_PASSCRED 2019-06-12 13:17:25 +02:00
Christoph M. Becker fc7b3cc7ca Fix nullbyte tests
As of PHP 8.0.0, failing ZPP throws instead of issuing warnings, to
which we have to cater to.
2019-06-12 12:48:03 +02:00
Christoph M. Becker be73ae3132 Merge branch 'PHP-7.4'
* PHP-7.4:
  Simplify GD null byte injection tests
2019-06-12 12:06:24 +02:00
Christoph M. Becker 37d0c7b0e4 Simplify GD null byte injection tests
These tests actually check that no file with a name containing a NUL is
created by the GD image output functions.  This is superfluous, since
it is sufficient to check that the function failed, and that an
appropriate warning has been raised.

We also add missing nullbyte injection tests.
2019-06-12 12:04:01 +02:00
Nikita Popov 477d1e02ae Merge branch 'PHP-7.4' 2019-06-12 11:54:21 +02:00
Nikita Popov 2f1d822d78 Preserve CFLAGS/LDFLAGS for curl ssl check
We need to add the curl-specific flags, but we also need to preserve
the general flags, to keep around important stuff like -m32.
2019-06-12 11:54:13 +02:00
Nikita Popov 365a905e00 Suppress int to char conversion warnings 2019-06-12 11:54:13 +02:00
Nikita Popov d2921af348 Use labs() on long integer 2019-06-12 11:54:13 +02:00
Nikita Popov 1d8c323b64 Don't use sqlite3_aggregate_count()
This function has been deprecated, with the recommendation that
the count should be explicitly tracked in the aggregate context,
if it is needed.
2019-06-12 11:54:12 +02:00
Nikita Popov 26a1b2e28e Fix type mismatch in two get_col callbacks 2019-06-12 11:54:12 +02:00
Nikita Popov f601eb15e6 Fix -Wmissing-braces warnings
Unfortunate that = {} is a GNU extension.
2019-06-12 11:54:12 +02:00
Derick Rethans 966e629f91 Merge branch 'PHP-7.4' 2019-06-12 08:58:19 +01:00
Derick Rethans 06ddc025ac Update credits pre-release 2019-06-12 08:58:11 +01:00
Joe Watkins 3926fa44a6 Merge branch 'PHP-7.4'
* PHP-7.4:
  fix flaky zip tests, order is OS dependent
2019-06-12 09:48:09 +02:00
Joe Watkins e2eb1ee1e3 fix flaky zip tests, order is OS dependent 2019-06-12 09:47:47 +02:00
Remi Collet 19d8e054b1 Merge branch 'PHP-7.4'
* PHP-7.4:
  add comment about pg_config/pkgconfig
2019-06-12 09:39:24 +02:00
Remi Collet 66bd7875f8 add comment about pg_config/pkgconfig 2019-06-12 09:39:11 +02:00