Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
#	ext/mbstring/php_mbregex.c

diff --cc NEWS
index 3fe60ff8eae2b244305778c5804052b76aeab4a8,44cd6e16eb2539da12057a8e529e122b05583a69..63ffcee1920cf119d158e6f1e413776ef90b2f6a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -61,16 -44,13 +61,18 @@@ PH
  - mbstring:
    . Fixed bug #72691 (mb_ereg_search raises a warning if a match zero-width).
      (cmb)
-   . Fixed Bug #72693 (mb_ereg_search increments search position when a match
+   . Fixed bug #72693 (mb_ereg_search increments search position when a match
      zero-width). (cmb)
+   . Fixed bug #72694 (mb_ereg_search_setpos does not accept a string's last
+     position). (cmb)
  
 +- Opcache:
 +  . Fixed bug #72590 (Opcache restart with kill_all_lockers does not work).
 +    (Keyur)
 +
  - PCRE:
    . Fixed bug #72688 (preg_match missing group names in matches). (cmb)
 +  . Upgraded to PCRE 8.39. (Anatol)
  
  - PDO_pgsql:
    . Fixed bug #70313 (PDO statement fails to throw exception). (Matteo)

diff --cc ext/mbstring/php_mbregex.c
index c86ea53ea15b548cc4c8c5bb33e0ac0db98e0a4a,9873a85da10ccb2bf8f64700a9a2bd55af8877bf..fc0b1d43e2c3a89dac496f72b70d809a5e468d93
--- 1/ext/mbstring/php_mbregex.c
--- 2/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@@ -1408,8 -1400,8 +1408,8 @@@ PHP_FUNCTION(mb_ereg_search_setpos
                return;
        }
  
-       if (position < 0 || (!Z_ISUNDEF(MBREX(search_str)) && Z_TYPE(MBREX(search_str)) == IS_STRING && (size_t)position >= Z_STRLEN(MBREX(search_str)))) {
 -      if (position < 0 || (MBREX(search_str) != NULL && Z_TYPE_P(MBREX(search_str)) == IS_STRING && position > Z_STRLEN_P(MBREX(search_str)))) {
 -              php_error_docref(NULL TSRMLS_CC, E_WARNING, "Position is out of range");
++      if (position < 0 || (!Z_ISUNDEF(MBREX(search_str)) && Z_TYPE(MBREX(search_str)) == IS_STRING && (size_t)position > Z_STRLEN(MBREX(search_str)))) {
 +              php_error_docref(NULL, E_WARNING, "Position is out of range");
                MBREX(search_pos) = 0;
                RETURN_FALSE;
        }