Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  ext/gd: phpinfo() to be able to display libjpeg 10.0 support.

Author: devnexen

NEWS

@@ -9,6 +9,10 @@ PHP                                                                        NEWS
 - Bz2:
   . Fix truncation of total output size causing erroneous errors. (ndossche)
 
+- GD:
+  . Fixed bug GH-21431 (phpinfo() to display libJPEG 10.0 support).
+    (David Carlier)
+
 - Opcache:
   . Fixed bug GH-21052 (Preloaded constant erroneously propagated to file-cached
     script). (ilutov)

ext/gd/libgd/gd_jpeg.c

@@ -125,6 +125,10 @@ const char * gdJpegGetVersionString()
 			return "9 compatible";
 			break;
 
+		case 100:
+			return "10 compatible";
+			break;
+
 		default:
 			return "unknown";
 	}