Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Updated NEWS for #67043
  Fixed bug 67043
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
  updated libs versions
  fixed the test for ICI >= 52.1
  Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...
  add missing skip to the output, so we actually skip this test
  fix the test according to how new date code does it
  fix to work on different ICU versions
  multibytes tests still fail, put them in XFAIL

Conflicts:
	ext/standard/string.c

Author: weltling

NEWS

@@ -11,6 +11,7 @@ PHP                                                                        NEWS
   . Fixed bug #66182 (exit in stream filter produces segfault). (Mike)  
   . Fixed bug #66736 (fpassthru broken). (Mike)
   . Fixed bug #66822 (Cannot use T_POW in const expression) (Tjerk)
+  . Fixed bug #67043 (substr_compare broke by previous change) (Tjerk)
 
 - SPL:
   . Added feature #65545 (SplFileObject::fread()) (Tjerk)

Zend/zend_exceptions.c

@@ -365,7 +365,7 @@ ZEND_METHOD(error_exception, getSeverity)
 
 #define TRACE_ARG_APPEND(vallen)								\
 	*str = (char*)erealloc(*str, *len + 1 + vallen);					\
-	memcpy((*str) + *len - l_added + 1 + vallen, (*str) + *len - l_added + 1, l_added);
+	memmove((*str) + *len - l_added + 1 + vallen, (*str) + *len - l_added + 1, l_added);
 
 /* }}} */
 

ext/intl/tests/dateformat_format.phpt

@@ -359,40 +359,40 @@ Formatted DateTime is : 20091231 03:02 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : Dec 30, 2000 5:04:05 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : 12/30/00 5:04 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : 20001230 05:04 PM

ext/intl/tests/dateformat_format_variant2.phpt

@@ -2,7 +2,7 @@
 datefmt_format_code()
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
-<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0) die('skip for ICU >= 51.2'); ?>
+<?php if (version_compare(INTL_ICU_VERSION, '51.2') < 0 || version_compare(INTL_ICU_VERSION, '52.1') >= 0) die('skip for ICU >= 51.2 && ICU < 52.1'); ?>
 --FILE--
 <?php