Merge branch 'PHP-8.1' into PHP-8.2

Author: devnexen

NEWS

@@ -14,6 +14,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-10168: use-after-free when utilizing assigned object freed
     during assignment. (nielsdos)
 
+- Curl:
+  . Fixed deprecation warning at compile time. (Max Kellermann)
+
 - Date:
   . Fix GH-10447 ('p' format specifier does not yield 'Z' for 00:00). (Derick)
   . Fix GH-10152 (Custom properties of Date's child classes are not

ext/curl/interface.c

@@ -62,6 +62,12 @@
 #include "curl_private.h"
 #include "curl_arginfo.h"
 
+#ifdef __GNUC__
+/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
+   need to keep using those to avoid breaking PHP API compatibiltiy */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
 static MUTEX_T *php_curl_openssl_tsl = NULL;