[pull] master from php:master

CONTRIBUTING.md

@@ -211,13 +211,20 @@ locations.
     └─ gd/
        ├─ libgd/                    # Bundled and modified GD library https://github.com/libgd/libgd
        └─ ...
+    └─ hash/
+       ├─ xxhash/                   # Bundled xxHash library https://github.com/Cyan4973/xxHash
+       └─ ...
+    └─ lexbor/
+       ├─ lexbor/                   # Bundled and modified Lexbor library https://github.com/lexbor/lexbor
+       └─ ...
     └─ mbstring/
        ├─ libmbfl/                  # Forked and maintained in php-src
        ├─ unicode_data.h            # Generated by `ext/mbstring/ucgendat/ucgendat.php`
        └─ ...
     └─ opcache/
        └─ jit/
-          └─ ir/                    # Bundled part of IR framework https://github.com/dstogov/ir
+          ├─ ir/                    # Bundled part of IR framework https://github.com/dstogov/ir
+          └─ ...
     └─ pcre/
        ├─ pcre2lib/                 # https://www.pcre.org/
        └─ ...
@@ -230,10 +237,14 @@ locations.
        ├─ credits_ext.h             # Generated by `scripts/dev/credits`
        ├─ credits_sapi.h            # Generated by `scripts/dev/credits`
        ├─ html_tables.h             # Generated by `ext/standard/html_tables/html_table_gen.php`
+       ├─ libavifinfo/              # Bundled libavifinfo https://aomedia.googlesource.com/libavifinfo
        └─ ...
     └─ tokenizer/
        ├─ tokenizer_data.c          # Generated by `ext/tokenizer/tokenizer_data_gen.sh`
        └─ ...
+    └─ uri/
+       ├─ uriparser/                # Bundled uriparser https://github.com/uriparser/uriparser
+       └─ ...
     └─ zend_test                    # For testing internal APIs. Not needed for regular builds.
        └─ ...
     └─ zip/                         # Bundled https://github.com/pierrejoye/php_zip
@@ -247,6 +258,8 @@ locations.
  └─ sapi/                           # PHP SAPI modules
     └─ cli/
        ├─ mime_type_map.h           # Generated by `sapi/cli/generate_mime_type_map.php`
+       ├─ php_http_parser.[ch]      # Forked from https://github.com/nodejs/http-parser
+       ├─ ps_title.c                # Adopted from https://github.com/postgres/postgres/blob/master/src/backend/utils/misc/ps_status.c
        └─ ...
     └─ ...
  ├─ scripts/                        # php-config, phpize and internal development scripts

UPGRADING

@@ -979,7 +979,6 @@ PHP 8.6 UPGRADE NOTES
   . Reduced temporary allocations when iterating Phar directories.
 
 - Standard:
-  . Improved performance of str_ends_with().
   . Improved performance of array_fill_keys().
   . Improved performance of array_intersect().
   . Improved performance of array_map() with multiple arrays passed.

ext/pdo/pdo_stmt.c

@@ -1589,7 +1589,7 @@ PHP_METHOD(PDOStatement, getColumnMeta)
 	/* add stock items */
 	col = &stmt->columns[colno];
 	add_assoc_str(return_value, "name", zend_string_copy(col->name));
-	add_assoc_long(return_value, "len", col->maxlen); /* FIXME: unsigned ? */
+	add_assoc_long(return_value, "len", col->maxlen);
 	add_assoc_long(return_value, "precision", col->precision);
 }
 /* }}} */

ext/pdo/php_pdo_driver.h

@@ -529,7 +529,7 @@ static inline pdo_dbh_t *php_pdo_dbh_fetch_inner(zend_object *obj) {
 /* describes a column */
 struct pdo_column_data {
 	zend_string *name;
-	size_t maxlen;
+	zend_long maxlen;
 	zend_ulong precision;
 };
 

ext/pdo_odbc/odbc_stmt.c

@@ -671,7 +671,8 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno)
 	}
 	colsize = displaysize;
 
-	col->maxlen = S->cols[colno].datalen = colsize;
+	S->cols[colno].datalen = colsize;
+	col->maxlen = displaysize;
 	col->name = zend_string_init(S->cols[colno].colname, colnamelen, 0);
 	S->cols[colno].is_unicode = pdo_odbc_sqltype_is_unicode(S, S->cols[colno].coltype);
 

ext/pdo_sqlite/sqlite_statement.c

@@ -249,7 +249,7 @@ static int pdo_sqlite_stmt_describe(pdo_stmt_t *stmt, int colno)
 
 	str = sqlite3_column_name(S->stmt, colno);
 	stmt->columns[colno].name = zend_string_init(str, strlen(str), 0);
-	stmt->columns[colno].maxlen = SIZE_MAX;
+	stmt->columns[colno].maxlen = -1;
 	stmt->columns[colno].precision = 0;
 
 	return 1;