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

62029 Commits

Author SHA1 Message Date
Máté Kocsis 413cbdf72f Declare FFI::__BIGGEST_ALIGNMENT__ in stubs as well 2022-06-04 09:59:29 +02:00
Máté Kocsis d476da7818 Declare ext/ffi constants in stubs (#8695) 2022-06-04 09:51:27 +02:00
David Carlier 271b723915 Merge branch 'PHP-8.1' 2022-06-03 15:15:46 +01:00
David Carlier 4a1c50b9be Merge branch 'PHP-8.0' into PHP-8.1 2022-06-03 15:15:30 +01:00
Yurun bfe63f565f Fix dblib ghtest8626 test.
Follow-up of GH-8628.
Closes GH-9694.
2022-06-03 15:12:09 +01:00
Remi Collet 5b2e413e89 Merge branch 'PHP-8.1'
* PHP-8.1:
  NEWS for GH-8685
  NEWS for GH-8685
  Fix GH-8685 mbstring requires pcre
2022-06-03 07:55:51 +02:00
Remi Collet 966a90873d Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  NEWS for GH-8685
  Fix GH-8685 mbstring requires pcre
2022-06-03 07:54:58 +02:00
Remi Collet 2eb2f9d74f Fix GH-8685 mbstring requires pcre 2022-06-03 07:53:48 +02:00
David Carlier 59503c0518 Merge branch 'PHP-8.1' 2022-06-02 17:36:02 +01:00
David Carlier 0f428ae240 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-02 17:35:45 +01:00
Yurun df52903ee0 Closes GH-8626: Fix PDOStatement->execute() failed.
Then execute successfully, errorInfo() information is incorrect
2022-06-02 17:32:43 +01:00
Sam 2ce2aff50e Better return types for getBackingType (#8687)
The only backing types for Enums are int and string. The proper return type for ReflectionEnum::getBackingType() is thus null|ReflectionNamedType.

See also https://github.com/php/doc-en/pull/1608

Closes GH-8687
2022-06-02 18:13:21 +02:00
Christoph M. Becker eb022f8071 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix test to require PDO_Firebird
2022-06-02 16:25:40 +02:00
Christoph M. Becker a528571cec Fix test to require PDO_Firebird 2022-06-02 16:22:45 +02:00
David CARLIER f813520b50 Implements socket ancillary data on FreeBSD. (#7708)
using LOCAL_CREDS_PERSISTENT/SCM_CREDS2 instead so we also get the send process id.
2022-06-02 14:08:03 +01:00
Derick Rethans 63aa5a4b5d Improve error message, and add additional test. 2022-06-02 09:24:13 +01:00
Derick Rethans c85fcbc218 Remove no longer used 'timezone_valid' flag 2022-06-02 09:24:13 +01:00
Derick Rethans 6770158d47 Only warn when an incorrect timezone is set through 'date.timezone' 2022-06-02 09:24:13 +01:00
Derick Rethans e0d21297fe Update wording of warning message, and reinstate 'UTC' fallback for ctor 2022-06-02 09:24:13 +01:00
Derick Rethans b3c6b540a1 Fixed bug #73239 (DateTime shows strange error message with invalid timezone) 2022-06-02 09:24:13 +01:00
Máté Kocsis bbc738e96b Declare ext/exif constants in stubs (#8680) 2022-06-01 20:16:43 +02:00
Máté Kocsis 8d79e665f1 Declare ext/enchant constants in stubs (#8679) 2022-06-01 20:15:10 +02:00
Sara Golemon e7817ec3b2 Do manual type checks because the engine doesn't 2022-06-01 16:27:47 +00:00
Sara Golemon 7c28196a8a Partial revert of 6d96f39a68 2022-06-01 16:10:30 +00:00
Levi Morrison 280fd680c8 Make vm_interrupt and timed_out atomic (#8327)
This is done by adding a new zend_atomic_bool type. The type
definition is only available for compiler alignment and size info; it
should be treated as opaque and only the zend_atomic_bool_* family of
functions should be used.

Note that directly using atomic_bool is complicated. All C++ compilers
stdlibs that I checked typedef atomic_bool to std::atomic<bool>, which
can't be used in an extern "C" section, and there's at least one usage
of this in core, and probably more outside of it.

So, instead use platform specific functions, preferring compiler
intrinsics.
2022-06-01 09:43:25 -06:00
David Carlier 30c8f3a80f Fix GH-8674: sockets extension won't build for older Linux kernels
In abscence of the needed header, disable the feature altogether.

Closes GH-8677.
2022-06-01 17:33:36 +02:00
Máté Kocsis 9c446a9354 Declare ext/dom constants in stubs (#8676) 2022-06-01 16:14:08 +02:00
Remi Collet 3670fa3b32 Merge branch 'PHP-8.1'
* PHP-8.1:
  use sha256 in openssl test suite
2022-06-01 11:46:59 +02:00
Remi Collet 03a4ccd912 use sha256 in openssl test suite 2022-06-01 11:46:47 +02:00
Máté Kocsis 2b6bfb0d80 Merge branch 'PHP-8.1'
* PHP-8.1:
  Get rid of invalid assertion and cleanup zend_call_method
2022-06-01 10:52:00 +02:00
Máté Kocsis 6d96f39a68 Get rid of invalid assertion and cleanup zend_call_method
Closes GH-8672
2022-06-01 10:50:50 +02:00
Sara Golemon 6c0a1db4a8 Merge branch 'PHP-8.1'
* PHP-8.1:
  Verify internal types before abandoning call frame
2022-06-01 00:52:30 +00:00
Sara Golemon 01d84545e7 Verify internal types before abandoning call frame
An internal caller executing a builtin method with
a static return type will lose context if we drop
our frame before performing the validation.
2022-06-01 00:51:08 +00:00
Kamil Tekiela 7d65cc81f8 Remove mysqli_close from clean_table.inc
Backported from master. See https://github.com/php/php-src/pull/8427
2022-06-01 00:02:55 +01:00
George Peter Banyard fcba0a49fc Fix test file name to not include a whitespace
This breaks the preload file flag in the test runner
2022-05-31 11:28:01 +01:00
Christoph M. Becker 57add48777 Revert "Make socket path shorter for ext/sockets/tests/socket_cmsg_{rights|credentials}.phpt"
This reverts commit b0c1773686, since
this causes CI failures, apparently related to ZTS builds.
2022-05-31 11:22:04 +02:00
Christoph M. Becker 8e2c08c5c2 Mark Windows mail tests as conflicting
These tests are not (yet) supposed to be run in parallel.
2022-05-31 10:50:59 +02:00
Andy Postnikov b0c1773686 Make socket path shorter for ext/sockets/tests/socket_cmsg_{rights|credentials}.phpt
When running in CI it fails when path/address is longer 108

Closes GH-8617.
2022-05-31 10:37:35 +02:00
Chen, Hu c1fcd45eeb JIT: Add IBT support (#8636)
Indirect Branch Tracking (IBT) is part of Intel's Control-Flow
Enforcement Technology (CET). IBT is hardware based, forward edge
Control-Flow-Integrity mechanism where any indirect CALL/JMP must target
an ENDBR instruction or suffer #CP.

This commit adds IBT support for JIT:
1. Add endbr32/64 instruction in Dynasm.
2. Insert endbr32/64 in indirect branch target for jitted code.

gcc support CET since v8.1 and set it to default since gcc 11. With this
commit, endbr is inserted in jitted code if PHP is compiled with "gcc
-fcf-protection=full/branch".

Signed-off-by: Chen, Hu <hu1.chen@intel.com>
2022-05-31 09:29:40 +03:00
Kamil Tekiela 23b0257fdc Remove tests for libmysql 2022-05-30 15:28:08 +01:00
Kamil Tekiela 01cbe390ca Remove mysqli_driver::$reconnect property 2022-05-30 15:28:08 +01:00
Kamil Tekiela 21ca8c43a8 The INI mysqli.reconnect directive has been removed. 2022-05-30 15:28:08 +01:00
Kamil Tekiela d84dfa3292 Remove MYSQLI_USE_MYSQLND constant and all the code with it 2022-05-30 15:28:08 +01:00
Kamil Tekiela 276e49c438 Remove libmysql 2022-05-30 15:28:08 +01:00
Dmitry Stogov e2e2d29973 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix memory leak
2022-05-30 11:39:24 +03:00
Dmitry Stogov 7ebda198ea Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix memory leak
2022-05-30 11:39:10 +03:00
Dmitry Stogov 3a8912fb7c Fix memory leak
This fixes oss-fuzz #47648
2022-05-30 11:32:17 +03:00
George Peter Banyard 4db981b74e Session: Refactor basedir to be a zend_string in mod_files 2022-05-29 15:24:06 +01:00
George Peter Banyard ec43006719 Session: Refactor last key to be a zend_string in mod_files 2022-05-29 15:24:06 +01:00
George Peter Banyard 8a1ca99aab Session: Use zend_string* consistently for key in mod_mm 2022-05-29 15:24:06 +01:00