1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Commit Graph

123248 Commits

Author SHA1 Message Date
Nikita Popov
53e9c36cd9 Add sanity check for type of read_property return value
If an internal class overrides read_property and declared property
types, make sure that the returned value matches the declared
type (in debug builds).
2021-03-16 10:42:47 +01:00
Derick Rethans
aad283e9f3 Merge branch 'PHP-8.0' 2021-03-16 09:41:47 +00:00
Derick Rethans
c2ff964de0 Merge branch 'PHP-7.4' into PHP-8.0 2021-03-16 09:41:40 +00:00
Derick Rethans
4adc08a403 Fix build version too 2021-03-16 09:41:21 +00:00
Derick Rethans
89f0bd92a0 Merge branch 'PHP-8.0' 2021-03-16 09:40:32 +00:00
Derick Rethans
7dbe27222c Merge branch 'PHP-7.4' into PHP-8.0 2021-03-16 09:40:21 +00:00
Derick Rethans
5e4ee3d0bd NEWS for 7.4.18 2021-03-16 09:40:05 +00:00
Derick Rethans
eb1d1fe373 Prepare for 7.4.17RC1 2021-03-16 09:33:33 +00:00
Máté Kocsis
66f16f4eb2 Merge branch 'PHP-8.0'
* Fix crash in LDAP search functions during argument validation
* Fix ldap_next_entry() parameter name
2021-03-16 09:34:41 +01:00
Máté Kocsis
465aa1d38f Fix ldap_next_entry() parameter name 2021-03-16 09:31:46 +01:00
Máté Kocsis
b03438ba3a Fix crash in LDAP search functions during argument validation 2021-03-16 09:31:37 +01:00
Máté Kocsis
87b263d2d7 Merge branch 'PHP-8.0' 2021-03-15 23:47:58 +01:00
Máté Kocsis
5ecc078a17 Add missing skipif sections to ext/dom tests 2021-03-15 23:45:37 +01:00
Christoph M. Becker
0b2bb98af9 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
2021-03-15 18:40:30 +01:00
Christoph M. Becker
eae69fcf71 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
2021-03-15 18:39:26 +01:00
Christoph M. Becker
f448b0e6dd Fix #80817: dba_popen() may cause segfault during RSHUTDOWN
We need to close persistent streams with the proper flag.
2021-03-15 18:37:44 +01:00
George Peter Banyard
f89f600d4f Add comment explaining empty default case 2021-03-15 16:39:40 +00:00
George Peter Banyard
6cc0d7c0ec Boolify pdo_dbh_attribute_set() 2021-03-15 14:48:33 +00:00
George Peter Banyard
3e6940fe29 Boolify pdo_hash_methods() 2021-03-15 14:48:33 +00:00
George Peter Banyard
262744ff0d Boolify pdo_stmt_describe_columns() 2021-03-15 14:48:33 +00:00
George Peter Banyard
63c4e8b5ab Voidify internal pdo_sqlstate_init_error_table()
This always returned SUCCESS
2021-03-15 14:48:33 +00:00
George Peter Banyard
0807c6cbb0 Remove php_pdo_str_tolower_dup() function 2021-03-15 14:48:33 +00:00
Dharman
5e1056edb6 Change the default error mode of mysqli
Make MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT the new mysqli
error reporting default. Explicitly call
mysqli_report(MYSQLI_REPORT_OFF) to preserve previous behavior.

RFC: https://wiki.php.net/rfc/mysqli_default_errmode

Closes GH-6629.
2021-03-15 14:55:31 +01:00
Nikita Popov
b82b85709d Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix bug #80866
2021-03-15 14:48:09 +01:00
Nikita Popov
50254de0a2 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix bug #80866
2021-03-15 14:48:02 +01:00
Dharman
282355efd5 Fix bug #80866
Closes GH-6774.
2021-03-15 14:47:45 +01:00
Nikita Popov
5604c2d05c Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix bug #80837
2021-03-15 14:38:56 +01:00
Nikita Popov
6493b516f9 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix bug #80837
2021-03-15 14:38:49 +01:00
Dharman
c93b461ad7 Fix bug #80837
The error needs to be reported on the statement, not the connection.
2021-03-15 14:38:09 +01:00
Nikita Popov
7e3840df90 Assert that stmt is set in PDORow 2021-03-15 14:22:49 +01:00
Nikita Popov
7e2f1a80d6 Merge branch 'PHP-8.0'
* PHP-8.0:
  Update ubuntu on i386 job
  Downgrade security level in tests using TLS < 1.2
2021-03-15 14:12:49 +01:00
Nikita Popov
3306baca50 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Update ubuntu on i386 job
  Downgrade security level in tests using TLS < 1.2
2021-03-15 14:12:42 +01:00
Nikita Popov
fc4cd598a2 Update ubuntu on i386 job
There is a failure with apt on PHP-7.4 that's not present on
PHP-8.0/master. Switching to a newer ubuntu version on PHP-7.4
avoids the issue.
2021-03-15 14:11:19 +01:00
Nikita Popov
703bbf5210 Downgrade security level in tests using TLS < 1.2
A few additional tests have been added on master that require
lower security level.

(cherry picked from commit c2a6395dcb)
2021-03-15 14:11:12 +01:00
Máté Kocsis
4833309bd2 Use typed properties in ext/mysqli
Closes GH-6739
2021-03-15 13:11:57 +01:00
Nikita Popov
f7751f2d8b Use zend_objects_not_comparable in PDO 2021-03-15 13:01:42 +01:00
Dharman
8573eb9e5c Add CLEAN sections to mysqli and PDO mysql tests
Closes GH-6756.
2021-03-15 11:01:12 +01:00
Nikita Popov
3b9ea4d289 Merge branch 'PHP-8.0'
* PHP-8.0:
  ext/opcache: fix configure output while checking mmap MAP_ANON support
2021-03-15 10:53:08 +01:00
Michael Heimpold
eaf9421df6 ext/opcache: fix configure output while checking mmap MAP_ANON support
It seems that f3efb9e3fb introduced a "typo" which may result
in the following confusing message:

checking for mmap() using MAP_ANON shared memory support... no=yes

Let's fix this.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Closes GH-6758.
2021-03-15 10:52:57 +01:00
Dharman
3dfd3558ca Deprecate mysqli driver_version property
The driver version hasn't been updated in 13 years, so this number
is essentially meaningless. Check PHP_VERSION_ID instead.
2021-03-15 10:48:36 +01:00
Nikita Popov
11dbed9b2f Remove dead mysqli_driver_construct() function
This function was never registered with PHP, and the body is
commented out.
2021-03-15 10:40:48 +01:00
Dharman
4bd3cb6626 Clean up mysqli_driver test cases
And remove an unnecessary test case that is already covered by the
other two.
2021-03-15 10:34:55 +01:00
Dharman
5801ead8ea Remove redundant macros in mysqli_driver implementation
This class doesn't define many properties, and the macros make
customization hard.
2021-03-15 10:34:05 +01:00
Dharman
475ea62dd7 Remove unused mysqli global
And fix formatting issues.
2021-03-15 10:33:03 +01:00
Dharman
321e0d451d client_info is a constant and doesn't need a connection
Closes GH-6767.
2021-03-15 10:24:42 +01:00
George Peter Banyard
d4530f807a Use zend_string* & more legible API for php_get_display_errors_mode() 2021-03-14 15:06:15 +00:00
Calison
021c988a6f Return early on php display error for better legibility
Closes GH-6760

Signed-off-by: George Peter Banyard <girgias@php.net>
2021-03-14 14:25:26 +00:00
Anatol Belski
8ff6dbb57c hash: xxhash: Use canonicalization routine from existing API
Signed-off-by: Anatol Belski <ab@php.net>
2021-03-13 21:38:10 +01:00
Dmitry Stogov
d5a15d2c91 Remove deprecated code 2021-03-13 01:04:43 +03:00
Dmitry Stogov
fe3dbe5294 Fixed compilation warning 2021-03-12 21:50:26 +03:00