Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/gd/gd.c
index e6ff62036b631418dbeca07c19fe903ac8dac787,192aed0af4d0f4370ea067cb3b91c9fcf4051b86..4202de9f1547930c86b6495a20c6c4447710a4f7
--- 1/ext/gd/gd.c
--- 2/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@@ -3856,9 -3854,8 +3856,9 @@@ static void php_imagettftext_common(INT
  {
        zval *IM, *EXT = NULL;
        gdImagePtr im=NULL;
-       zend_long col = -1, x = -1, y = -1;
 -      long col = -1, x = 0, y = 0;
 -      int str_len, fontname_len, i, brect[8];
++      zend_long col = -1, x = 0, y = 0;
 +      size_t str_len, fontname_len;
 +      int i, brect[8];
        double ptsize, angle;
        char *str = NULL, *fontname = NULL;
        char *error = NULL;

diff --cc ext/gd/libgd/gdft.c
Simple merge