summaryrefslogtreecommitdiffstats
path: root/xrange-svn.patch
blob: aa75cee04d8b70cd62f6ba39b66356b80c1fdccf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
--- pecl/xrange/trunk/xrange.c	2013/10/06 10:21:25	331706
+++ pecl/xrange/trunk/xrange.c	2013/10/06 11:48:38	331707
@@ -175,21 +175,21 @@
 	zend_class_implements(php_xrange_xri_entry TSRMLS_CC, 1, spl_ce_Countable);
 
 	/* Register Class: OddFilterIterator */
-	memset(&ce, sizeof(ce), '\0');
+	memset(&ce, 0, sizeof(ce));
 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_ODDFILTERITERATOR_NAME, php_xrange_OddFilterIterator_functions);
     ce.name_length = strlen(PHP_XRANGE_ODDFILTERITERATOR_NAME); 
 	php_xrange_OddFilterIterator_entry =
 		zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
 
 	/* Register Class: EvenFilterIterator */
-	memset(&ce, sizeof(ce), '\0');
+	memset(&ce, 0, sizeof(ce));
 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_EVENFILTERITERATOR_NAME, php_xrange_EvenFilterIterator_functions);
     ce.name_length = strlen(PHP_XRANGE_EVENFILTERITERATOR_NAME); 
 	php_xrange_EvenFilterIterator_entry =
 		zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
 
 	/* Register Class: NumericFilterIterator */
-	memset(&ce, sizeof(ce), '\0');
+	memset(&ce, 0, sizeof(ce));
 	INIT_CLASS_ENTRY(ce, PHP_XRANGE_NUMERICFILTERITERATOR_NAME, php_xrange_NumericFilterIterator_functions);
     ce.name_length = strlen(PHP_XRANGE_NUMERICFILTERITERATOR_NAME); 
 	php_xrange_NumericFilterIterator_entry =
--- pecl/xrange/trunk/tests/004.002.phpt	2013/10/06 11:48:38	331707
+++ pecl/xrange/trunk/tests/004.002.phpt	2013/10/06 11:51:24	331708
@@ -11,4 +11,4 @@
 echo $j == 21 ? 'Success' : 'Failure';
 ?>
 --EXPECTF--
-Fatal error: Cannot create references to elements of a temporary array expression %a
+Fatal error: %a reference%a
--- pecl/xrange/trunk/tests/010.010.phpt	2013/11/09 11:52:44	332089
+++ pecl/xrange/trunk/tests/010.010.phpt	2013/11/09 16:08:07	332090
@@ -2,6 +2,8 @@
 Test xrange() against range() - 010
 --SKIPIF--
 <?php if (!extension_loaded("xrange")) print "skip"; ?>
+--INI--
+precision=8
 --FILE--
 <?php 
 // don't necessarily match up with the equality operator (in this test)
--- pecl/xrange/trunk/tests/010.011.phpt	2013/11/09 11:52:44	332089
+++ pecl/xrange/trunk/tests/010.011.phpt	2013/11/09 16:08:07	332090
@@ -2,6 +2,8 @@
 Test xrange() against range() - 011
 --SKIPIF--
 <?php if (!extension_loaded("xrange")) print "skip"; ?>
+--INI--
+precision=8
 --FILE--
 <?php 
 // don't necessarily match up with the equality operator (in this test)