Merge branch 'PHP-7.0'

weltling · weltling · commit fd598ed2c2f7 · 2015-11-12T13:38:43.000+01:00
* PHP-7.0:
  fixed typo
diff --git a/Zend/tests/bug70895.phpt b/Zend/tests/bug70895.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70895 null ptr deref and segfault with crafted calable
+Bug #70895 null ptr deref and segfault with crafted callable
 --FILE--
 <?php
 
diff --git a/Zend/tests/bug70898.phpt b/Zend/tests/bug70898.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #70895 null ptr deref and segfault with crafted calable
+Bug #70895 null ptr deref and segfault with crafted callable
 --FILE--
 <?php 
 	function m($f,$a){

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 --TEST--
 -Bug #70895 null ptr deref and segfault with crafted calable
 +Bug #70895 null ptr deref and segfault with crafted callable
 --FILE--
 <?php