From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 24 Sep 2016 13:35:32 +0000 (+0200)
Subject: Merge branch 'pull-request/2026'
X-Git-Tag: php-7.2.0alpha1~1232^2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e1d20a28b48bd801c5367ab9b69eb79b1cb1dda;p=php

Merge branch 'pull-request/2026'
---

2e1d20a28b48bd801c5367ab9b69eb79b1cb1dda
diff --cc UPGRADING
index 2c66c4263a,5400a2eee6..f37d71212e
--- a/UPGRADING
+++ b/UPGRADING
@@@ -67,14 -153,17 +67,17 @@@ PHP 7.2 UPGRADE NOTE
  ========================================
  6. New Functions
  ========================================
 -- Core:
 -  . Added sapi_windows_cp_set(), sapi_windows_cp_get(), sapi_windows_cp_is_utf8(),
 -    sapi_windows_cp_conv() for codepage handling.
  
 -- pcntl:
 -  . Added pcntl_signal_get_handler() that returns the current signal handler
 -    for a particular signal.
++- GD:
++  . Added imagesetclip() and imagegetclip().
+ 
 -- Standard:
 -  . Added is_iterable() that determines if a value will be accepted by the new
 -    iterable pseudo-type.
 +- Mbstring:
 +  . Added mb_chr() and mb_ord().
 +  . Added mb_scurb() that scrub broken multibyte strings.
 +
 +- Sockets:
 +  . Added socket_addrinfo_lookup(), socket_addrinfo_connect(),
 +    socket_addrinfo_bind() and socket_addrinfo_explain().
  
  ========================================
  7. New Classes and Interfaces