Merge branch 'PHP-7.0' into PHP-7.1

weltling · weltling · commit 41ba98f02d6c · 2017-07-04T16:38:12.000+02:00
* PHP-7.0:
  fix datatype
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
@@ -1404,7 +1404,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER)
 	++YYCURSOR;
 #line 833 "ext/standard/var_unserializer.re"
 	{
-	long elements;
+	zend_long elements;
     if (!var_hash) return 0;
 
 	elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
@@ -831,7 +831,7 @@ use_double:
 }
 
 "o:" iv ":" ["] {
-	long elements;
+	zend_long elements;
     if (!var_hash) return 0;
 
 	elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);

Original file line number	Diff line number	Diff line change
`@@ -1404,7 +1404,7 @@ static int php_var_unserialize_internal(UNSERIALIZE_PARAMETER)`
`1404`	`1404`	`++YYCURSOR;`
`1405`	`1405`	`#line 833 "ext/standard/var_unserializer.re"`
`1406`	`1406`	`{`
`1407`		`- long elements;`
	`1407`	`+ zend_long elements;`
`1408`	`1408`	`if (!var_hash) return 0;`
`1409`	`1409`
`1410`	`1410`	`elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);`
Original file line number	Diff line number	Diff line change
`@@ -831,7 +831,7 @@ use_double:`
`831`	`831`	`}`
`832`	`832`
`833`	`833`	`"o:" iv ":" ["] {`
`834`		`- long elements;`
	`834`	`+ zend_long elements;`
`835`	`835`	`if (!var_hash) return 0;`
`836`	`836`
`837`	`837`	`elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);`