Commit 50aebf35082 for php.net

commit 50aebf3508200c76f0fc73f41eb862248f8d88cc
Merge: e5fa4ec36a5 ac1390f60eb
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date:   Wed May 6 11:02:27 2026 +0200

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Fix compiler warning with glibc 2.43 support of C23 const-preserving standard library macros: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
      Fix compiler warning with GCC 16: variable 'offset' set but not used [-Werror=unused-but-set-variable=]

diff --cc ext/mysqlnd/mysqlnd_result.c
index bce57b0ab05,f43b1d7f59d..1f811c8795d
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@@ -989,8 -994,7 +989,8 @@@ MYSQLND_METHOD(mysqlnd_res, fetch_into)
  	array_init_size(return_value, array_size);

  	HashTable *row_ht = Z_ARRVAL_P(return_value);
 +	MYSQLND_FIELD *field = meta->fields;
- 	for (unsigned i = 0; i < meta->field_count; i++, field++) {
+ 	for (unsigned i = 0; i < meta->field_count; i++) {
  		zval *data = &row_data[i];

  		if (flags & MYSQLND_FETCH_NUM) {
diff --cc ext/phar/phar_object.c
index 66d54373240,cc94539bd24..260214cc368
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -349,10 -341,9 +349,10 @@@ static void phar_do_404(phar_archive_da
  /* post-process REQUEST_URI and retrieve the actual request URI.  This is for
     cases like http://localhost/blah.phar/path/to/file.php/extra/stuff
     which calls "blah.phar" file "path/to/file.php" with PATH_INFO "/extra/stuff" */
- static void phar_postprocess_ru_web(const char *fname, size_t fname_len, const char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
 -static void phar_postprocess_ru_web(char *fname, size_t fname_len, char **entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
++static void phar_postprocess_ru_web(const char *fname, size_t fname_len, char *entry, size_t *entry_len, char **ru, size_t *ru_len) /* {{{ */
  {
- 	const char *e = entry + 1;
 -	char *e = *entry + 1, *u = NULL, *u1 = NULL, *saveu = NULL;
++	char *e = entry + 1;
 +	char *u1 = NULL, *u = NULL, *saveu = NULL;
  	size_t e_len = *entry_len - 1, u_len = 0;
  	phar_archive_data *pphar;