1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 00:48:25 +02:00
Commit Graph

117643 Commits

Author SHA1 Message Date
Nikita Popov bb85478bcc Merge branch 'PHP-7.4'
* PHP-7.4:
  Try to fix msvc build
2020-02-28 14:49:03 +01:00
Nikita Popov a7de98fb12 Try to fix msvc build 2020-02-28 14:48:02 +01:00
Nikita Popov a297c4ef9e Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix another flaky FPM test
2020-02-28 14:41:32 +01:00
Nikita Popov b2d01e0be8 Fix another flaky FPM test 2020-02-28 14:40:21 +01:00
Máté Kocsis d70e6bdcde Add stubs for UConverter
Closes GH-5218
2020-02-28 14:37:37 +01:00
Máté Kocsis 3ab75ac019 Update MySQLi function info
Closes GH-5214
2020-02-28 14:36:54 +01:00
Nikita Popov b89ba475df Merge branch 'PHP-7.4'
* PHP-7.4:
  Try to fix intermittent FPM failures
2020-02-28 13:19:53 +01:00
Nikita Popov 3c096b51f9 Try to fix intermittent FPM failures
Terminate only after expecting the log lines to avoid race
condition.
2020-02-28 13:19:10 +01:00
Nikita Popov 519a72e0b4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #79252
2020-02-28 12:49:45 +01:00
Nikita Popov 30ee3f48d4 Fixed bug #79252 2020-02-28 12:47:56 +01:00
Nikita Popov 06ac14f7f2 Avoid duplicate calls to interface implementation handler 2020-02-28 12:17:01 +01:00
Remi Collet 06750d75e9 Merge branch 'PHP-7.4'
* PHP-7.4:
  fix test
2020-02-28 10:39:43 +01:00
Remi Collet 5b82fd491a fix test 2020-02-28 10:39:08 +01:00
Remi Collet 32e5ca234a Merge branch 'PHP-7.4'
* PHP-7.4:
  NEWS
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
2020-02-28 10:36:34 +01:00
Remi Collet 1b40bb76b9 NEWS 2020-02-28 10:36:12 +01:00
Remi Collet 7f0d3f1eab Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
2020-02-28 10:35:39 +01:00
Remi Collet d31fc591e0 Fix #79315 ZipArchive::addFile doesn't honor start/length parameters 2020-02-28 10:29:50 +01:00
Remi Collet 165d38a38d Merge branch 'PHP-7.4'
* PHP-7.4:
  NEWS
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
2020-02-28 10:29:30 +01:00
Remi Collet 3725faa3db NEWS 2020-02-28 10:24:52 +01:00
Remi Collet fb881cbdfc Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #79315 ZipArchive::addFile doesn't honor start/length parameters
2020-02-28 10:23:19 +01:00
Nikita Popov c5e8c25dda Merge branch 'PHP-7.4'
* PHP-7.4:
  Use type-checked ref assignment in UConverter
2020-02-28 10:22:11 +01:00
Nikita Popov 6d19acf54b Use type-checked ref assignment in UConverter 2020-02-28 10:21:50 +01:00
Remi Collet 5b2d4c0ecc Fix #79315 ZipArchive::addFile doesn't honor start/length parameters 2020-02-28 10:21:19 +01:00
George Peter Banyard 5d62f95ec7 Use {0} to initialize instead of {NULL}
Clang emits a [-Wmissing-field-initializers] when using {NULL} instead of {0}
2020-02-28 00:21:25 +01:00
Dmitry Stogov 63761d1133 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed incorrect overflow detection
2020-02-27 23:38:19 +03:00
Dmitry Stogov cb88184420 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fixed incorrect overflow detection
2020-02-27 23:38:09 +03:00
Dmitry Stogov 5b51b633e2 Fixed incorrect overflow detection 2020-02-27 23:37:41 +03:00
Nikita Popov 819a872cfa Avoid more null arithmetic 2020-02-27 14:48:43 +01:00
Nikita Popov 5a90392c6a Use EX_NUM_TO_VAR() in more places
Not sure why I missed these before.
2020-02-27 13:13:24 +01:00
Nikita Popov 1949a26aac Remove more null arithmetic UB
Introduce an EX_NUM_TO_VAR macro to mirror EX_VAR_TO_NUM and
replace usages of the ZEND_CALL_VAR_NUM(NULL) pattern.
2020-02-27 12:54:48 +01:00
Christoph M. Becker 3ae04b05f5 Merge branch 'PHP-7.4'
* PHP-7.4:
  Add upgrading node regarding fix for bug #79271
2020-02-27 10:39:07 +01:00
Christoph M. Becker ac2382d437 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Add upgrading node regarding fix for bug #79271
2020-02-27 10:37:52 +01:00
Nikita Popov 84854a72c7 Remove mergesort implementation
php_mergesort() isn't being used for anything, and hasn't been for
a long time. Even if we wanted to use a stable sort, this isn't
the implementation we'd use...
2020-02-27 10:36:01 +01:00
Christoph M. Becker 49762c84e0 Add upgrading node regarding fix for bug #79271
Cf. <https://github.com/php/php-src/pull/5180#issuecomment-590259750>ff.
2020-02-27 10:33:20 +01:00
Nikita Popov 0427ef91a6 Avoid null arithmetic UB in EX_VAR_TO_NUM 2020-02-27 10:30:16 +01:00
Dmitry Stogov 4786207ecc Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed incorrect behavior of internal memory debugger
2020-02-27 12:28:09 +03:00
Dmitry Stogov d9f56903ad Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fixed incorrect behavior of internal memory debugger
2020-02-27 12:27:58 +03:00
Dmitry Stogov 45b4368d5c Fixed incorrect behavior of internal memory debugger 2020-02-27 12:27:22 +03:00
Christoph M. Becker 30d18b8ced Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix #64032: mysqli reports different client_version
2020-02-27 09:40:31 +01:00
Christoph M. Becker 78e04759ad Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #64032: mysqli reports different client_version
2020-02-27 09:39:13 +01:00
Christoph M. Becker 8654c32b58 Fix #64032: mysqli reports different client_version
While `mysqli_get_client_version()` calls `mysql_get_client_version()`
to retrieve the client version, `mysql::$client_version` is initialized
to `MYSQL_VERSION_ID`.  Both should match though, and since the former
is the more useful information, we fix `mysql::$client_version`.

We do not add a regression test, because it would usually succeed
anyway, and we already have several tests with respective `assert()`s.
2020-02-27 09:35:04 +01:00
Nikita Popov a51c98e696 Merge branch 'PHP-7.4'
* PHP-7.4:
  Add test for bug #60161
2020-02-26 16:48:41 +01:00
Nikita Popov 8c8f8c4193 Add test for bug #60161
This has been fixed in PHP 7.4, let's make sure it stays fixed.
2020-02-26 16:48:03 +01:00
Máté Kocsis 960318ed95 Change argument error message format
Closes GH-5211
2020-02-26 15:00:08 +01:00
George Peter Banyard c7094d8926 Fix mbstring regex variable types to correspond to Oniguruma
The beginning and ending of a Oniguruma Regex are stored in a OnigRegion (which is a typedef to the Oniguruma re_registers struct) as as int* therefore change the type from size_t to int

Closes GH-5196
2020-02-26 11:24:03 +01:00
Nikita Popov b35b0142e6 Require all internal functions to have arginfo 2020-02-26 10:05:20 +01:00
Nikita Popov 8d30d5f269 Add stubs for COMPersistHelper 2020-02-26 10:00:08 +01:00
George Peter Banyard 1fdc53bc96 Remove deprecated capture_session_meta OpenSSL stream context
Closes GH-5200
2020-02-26 03:09:13 +01:00
Máté Kocsis 81fee9f29f Get rid of method mapping of BreakIterator classes 2020-02-25 23:05:24 +01:00
Máté Kocsis bcb7847139 Add stubs for Intl BreakIterator
Closes GH-5207
2020-02-25 23:05:03 +01:00