Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #51498: imagefilledellipse does not work for large circles

Author: cmb69

NEWS

@@ -15,6 +15,9 @@ PHP                                                                        NEWS
 - CGI:
   . Fixed bug #80849 (HTTP Status header truncation). (cmb)
 
+- GD:
+  . Fixed bug #51498 (imagefilledellipse does not work for large circles). (cmb)
+
 - Opcache:
   . Fixed bug #81225 (Wrong result with pow operator with JIT enabled).
     (Dmitry)

ext/gd/libgd/gd.c

@@ -1715,7 +1715,7 @@ void gdImageFilledArc (gdImagePtr im, int cx, int cy, int w, int h, int s, int e
 void gdImageEllipse(gdImagePtr im, int mx, int my, int w, int h, int c)
 {
 	int x=0,mx1=0,mx2=0,my1=0,my2=0;
-	long aq,bq,dx,dy,r,rx,ry,a,b;
+	int64_t aq,bq,dx,dy,r,rx,ry,a,b;
 
 	a=w>>1;
 	b=h>>1;
@@ -1754,7 +1754,7 @@ void gdImageEllipse(gdImagePtr im, int mx, int my, int w, int h, int c)
 void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
 {
 	int x=0,mx1=0,mx2=0,my1=0,my2=0;
-	long aq,bq,dx,dy,r,rx,ry,a,b;
+	int64_t aq,bq,dx,dy,r,rx,ry,a,b;
 	int i;
 	int old_y2;
 

ext/gd/tests/bug51498.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Bug #51498 (imagefilledellipse does not work for large circles)
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die("skip gd extension not available");
+if (!GD_BUNDLED && version_compare(GD_VERSION, "2.3.0") < 0) {
+    die("skip test requires GD 2.3.0 or higher");
+}
+?>
+--FILE--
+<?php
+$img = imagecreatetruecolor(2200, 2200);
+$white = imagecolorallocate($img, 255, 255, 255);
+imagefilledellipse($img, 1100, 1100, 2200, 2200, $white);
+
+require_once __DIR__ . '/func.inc';
+test_image_equals_file(__DIR__ . '/bug51498_exp.png', $img);
+?>
+--EXPECT--
+The images are equal.