Commit f488c95a739 for php
commit f488c95a739aed1565daffba33ef8138c98593b5
Author: Artem Ukrainskiy <art.ukrainskiy@gmail.com>
Date: Wed Nov 18 01:26:12 2026 +0300
session: Put ZEND_ATTRIBUTE_DEPRECATED first on php_session_valid_key() (#25539)
Since ZEND_ATTRIBUTE_DEPRECATED is [[deprecated]] in C23, it must come
before the other declaration specifiers. After PHPAPI it doesn't compile
with GCC 15, which defaults to C23.
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index c43a2a3de15..2268395906d 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -249,7 +249,7 @@ PHPAPI php_session_status php_get_session_status(void);
PHPAPI const ps_module *_php_find_ps_module(const char *name);
PHPAPI const ps_serializer *_php_find_ps_serializer(const char *name);
-PHPAPI ZEND_ATTRIBUTE_DEPRECATED zend_result php_session_valid_key(const char *key);
+ZEND_ATTRIBUTE_DEPRECATED PHPAPI zend_result php_session_valid_key(const char *key);
PHPAPI zend_result php_session_valid_key_ex(const zend_string *key);
PHPAPI zend_result php_session_reset_id(void);
diff --git a/ext/session/session.c b/ext/session/session.c
index 4bb46eacfa2..9c1ac690513 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -395,7 +395,7 @@ PHPAPI zend_result php_session_valid_key_ex(const zend_string *key)
/* C-string compatibility wrapper. Callers that have a zend_string should use
* php_session_valid_key_ex() instead. */
-PHPAPI ZEND_ATTRIBUTE_DEPRECATED zend_result php_session_valid_key(const char *key)
+ZEND_ATTRIBUTE_DEPRECATED PHPAPI zend_result php_session_valid_key(const char *key)
{
return php_session_valid_key_len(key, strlen(key));
}