]> git.pld-linux.org Git - packages/php.git/blame - bug-52078-fileinode.patch
This commit was manufactured by cvs2git to create branch 'DEVEL'.
[packages/php.git] / bug-52078-fileinode.patch
CommitLineData
c0240cb1 1--- php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt~ 2008-11-25 13:33:41.000000000 +0200
2+++ php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt 2010-06-14 00:23:51.340272864 +0300
3@@ -57,15 +57,15 @@
4 --EXPECTF--
5 *** Testing fileinode() with different notations of file names ***
6 - Iteration 1 -
7-int(%d)
8+int(%i)
9 - Iteration 2 -
10
11 Warning: fileinode(): stat failed for %s//fileinode_variation3/fileinode_variation3.tmp/ in %s on line %d
12 bool(false)
13 - Iteration 3 -
14-int(%d)
15+int(%i)
16 - Iteration 4 -
17-int(%d)
18+int(%i)
19 - Iteration 5 -
20
21 Warning: fileinode(): stat failed for %s//fileinode_variation3/*.tmp in %s on line %d
22--- php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~ 2007-11-05 19:43:21.000000000 +0200
23+++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt 2010-07-26 19:31:43.613553760 +0300
24@@ -28,9 +28,9 @@
25 ?>
26 --EXPECTF--
27 *** Testing fileinode() with file, directory ***
28-%d
29-%d
30-%d
31-%d
32+%i
33+%i
34+%i
35+%i
36
37 *** Done ***
38--- php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt~ 2007-11-05 19:43:21.000000000 +0200
39+++ php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt 2010-07-26 19:34:01.610414378 +0300
40@@ -89,24 +89,24 @@
41 --EXPECTF--
42 *** Testing fileinode() with files, links and directories ***
43 -- Testing with files --
44-%d
45-%d
46+%i
47+%i
48 -- Testing with links: hard link --
49-%d
50-%d
51+%i
52+%i
53 -- Testing with links: soft link --
54-%d
55-%d
56+%i
57+%i
58 -- Testing after copying a file --
59-%d
60-%d
61+%i
62+%i
63 -- Testing after renaming the file --
64-%d
65-%d
66+%i
67+%i
68 -- Testing with directories --
69-%d
70-%d
71+%i
72+%i
73 -- Testing with binary input --
74-%d
75-%d
76+%i
77+%i
78 *** Done ***
79--- php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt~ 2008-11-26 12:10:19.000000000 +0200
80+++ php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt 2010-07-26 19:35:31.216291870 +0300
81@@ -42,7 +42,7 @@
82
83 --EXPECTF--
84 *** Testing fileinode() with links ***
85-int(%d)
86-int(%d)
87+int(%i)
88+int(%i)
89
90 *** Done ***
91--- php-5.3.3/ext/standard/tests/file/filestat.phpt~ 2006-11-15 19:27:03.000000000 +0200
92+++ php-5.3.3/ext/standard/tests/file/filestat.phpt 2010-07-26 19:37:10.367060798 +0300
93@@ -30,17 +30,17 @@
94 echo "Done\n";
95 ?>
96 --EXPECTF--
97+int(%i)
98 int(%d)
99 int(%d)
100 int(%d)
101 int(%d)
102+int(%i)
103 int(%d)
104 int(%d)
105 int(%d)
106 int(%d)
107-int(%d)
108-int(%d)
109-int(%d)
110+int(%i)
111 int(%d)
112 int(%d)
113 int(%d)
114--- php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt~ 2010-07-26 19:43:12.000000000 +0300
115+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt 2010-07-26 19:43:14.470984630 +0300
116@@ -66,7 +66,7 @@
117 [0]=>
118 int(%d)
119 [1]=>
120- int(%d)
121+ int(%i)
122 [2]=>
123 int(%d)
124 [3]=>
125@@ -92,7 +92,7 @@
126 ["dev"]=>
127 int(%d)
128 ["ino"]=>
129- int(%d)
130+ int(%i)
131 ["mode"]=>
132 int(%d)
133 ["nlink"]=>
134@@ -122,7 +122,7 @@
135 [0]=>
136 int(%d)
137 [1]=>
138- int(%d)
139+ int(%i)
140 [2]=>
141 int(%d)
142 [3]=>
143@@ -148,7 +148,7 @@
144 ["dev"]=>
145 int(%d)
146 ["ino"]=>
147- int(%d)
148+ int(%i)
149 ["mode"]=>
150 int(%d)
151 ["nlink"]=>
152--- php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt~ 2007-11-05 19:43:21.000000000 +0200
153+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt 2010-07-26 19:44:58.320079730 +0300
154@@ -67,7 +67,7 @@
155 [0]=>
156 int(%d)
157 [1]=>
158- int(%d)
159+ int(%i)
160 [2]=>
161 int(%d)
162 [3]=>
163@@ -93,7 +93,7 @@
164 ["dev"]=>
165 int(%d)
166 ["ino"]=>
167- int(%d)
168+ int(%i)
169 ["mode"]=>
170 int(%d)
171 ["nlink"]=>
172@@ -121,7 +121,7 @@
173 [0]=>
174 int(%d)
175 [1]=>
176- int(%d)
177+ int(%i)
178 [2]=>
179 int(%d)
180 [3]=>
181@@ -147,7 +147,7 @@
182 ["dev"]=>
183 int(%d)
184 ["ino"]=>
185- int(%d)
186+ int(%i)
187 ["mode"]=>
188 int(%d)
189 ["nlink"]=>
190@@ -177,7 +177,7 @@
191 [0]=>
192 int(%d)
193 [1]=>
194- int(%d)
195+ int(%i)
196 [2]=>
197 int(%d)
198 [3]=>
199@@ -203,7 +203,7 @@
200 ["dev"]=>
201 int(%d)
202 ["ino"]=>
203- int(%d)
204+ int(%i)
205 ["mode"]=>
206 int(%d)
207 ["nlink"]=>
208@@ -231,7 +231,7 @@
209 [0]=>
210 int(%d)
211 [1]=>
212- int(%d)
213+ int(%i)
214 [2]=>
215 int(%d)
216 [3]=>
217@@ -257,7 +257,7 @@
218 ["dev"]=>
219 int(%d)
220 ["ino"]=>
221- int(%d)
222+ int(%i)
223 ["mode"]=>
224 int(%d)
225 ["nlink"]=>
226--- php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt~ 2007-07-26 16:38:24.000000000 +0300
227+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt 2010-07-26 19:46:33.907004377 +0300
228@@ -69,7 +69,7 @@
229 [0]=>
230 int(%d)
231 [1]=>
232- int(%d)
233+ int(%i)
234 [2]=>
235 int(%d)
236 [3]=>
237@@ -95,7 +95,7 @@
238 ["dev"]=>
239 int(%d)
240 ["ino"]=>
241- int(%d)
242+ int(%i)
243 ["mode"]=>
244 int(%d)
245 ["nlink"]=>
246@@ -125,7 +125,7 @@
247 [0]=>
248 int(%d)
249 [1]=>
250- int(%d)
251+ int(%i)
252 [2]=>
253 int(%d)
254 [3]=>
255@@ -151,7 +151,7 @@
256 ["dev"]=>
257 int(%d)
258 ["ino"]=>
259- int(%d)
260+ int(%i)
261 ["mode"]=>
262 int(%d)
263 ["nlink"]=>
264@@ -179,7 +179,7 @@
265 [0]=>
266 int(%d)
267 [1]=>
268- int(%d)
269+ int(%i)
270 [2]=>
271 int(%d)
272 [3]=>
273@@ -205,7 +205,7 @@
274 ["dev"]=>
275 int(%d)
276 ["ino"]=>
277- int(%d)
278+ int(%i)
279 ["mode"]=>
280 int(%d)
281 ["nlink"]=>
282@@ -233,7 +233,7 @@
283 [0]=>
284 int(%d)
285 [1]=>
286- int(%d)
287+ int(%i)
288 [2]=>
289 int(%d)
290 [3]=>
291@@ -259,7 +259,7 @@
292 ["dev"]=>
293 int(%d)
294 ["ino"]=>
295- int(%d)
296+ int(%i)
297 ["mode"]=>
298 int(%d)
299 ["nlink"]=>
300--- php-5.3.3/ext/standard/tests/file/tempnam_variation1.phpt~ 2008-11-26 12:10:19.000000000 +0200
301+++ php-5.3.3/ext/standard/tests/file/tempnam_variation1.phpt 2010-07-26 20:24:46.505943227 +0300
302@@ -66,51 +66,51 @@
303 -- Iteration 1 --
304 File name is => %s%etempnam_variation1.tmp%s
305 File permissions are => 100600
306-File inode is => %d
307+File inode is => %i
308 File created in => directory specified
309 -- Iteration 2 --
310 File name is => %s%etempnam_variation1.tmp%s
311 File permissions are => 100600
312-File inode is => %d
313+File inode is => %i
314 File created in => directory specified
315 -- Iteration 3 --
316 File name is => %s%etempnam_variation1.tmp%s
317 File permissions are => 100600
318-File inode is => %d
319+File inode is => %i
320 File created in => directory specified
321 -- Iteration 4 --
322 File name is => %s%etempnam_variation1.tmp%s
323 File permissions are => 100600
324-File inode is => %d
325+File inode is => %i
326 File created in => directory specified
327 -- Iteration 5 --
328 File name is => %s%etempnam_variation1.tmp%s
329 File permissions are => 100600
330-File inode is => %d
331+File inode is => %i
332 File created in => directory specified
333 -- Iteration 6 --
334 File name is => %s%etempnam_variation1.tmp%s
335 File permissions are => 100600
336-File inode is => %d
337+File inode is => %i
338 File created in => directory specified
339 -- Iteration 7 --
340 File name is => %s%etempnam_variation1.tmp%s
341 File permissions are => 100600
342-File inode is => %d
343+File inode is => %i
344 File created in => directory specified
345 -- Iteration 8 --
346 File name is => %s%etempnam_variation1.tmp%s
347 File permissions are => 100600
348-File inode is => %d
349+File inode is => %i
350 File created in => directory specified
351 -- Iteration 9 --
352 File name is => %s%etempnam_variation1.tmp%s
353 File permissions are => 100600
354-File inode is => %d
355+File inode is => %i
356 File created in => directory specified
357 -- Iteration 10 --
358 File name is => %s%etempnam_variation1.tmp%s
359 File permissions are => 100600
360-File inode is => %d
361+File inode is => %i
362 File created in => directory specified
363 *** Done ***
364--- php-5.3.3/tests/security/open_basedir_fileinode.phpt~ 2008-05-09 11:39:44.000000000 +0300
365+++ php-5.3.3/tests/security/open_basedir_fileinode.phpt 2010-07-27 22:51:29.603089549 +0300
366@@ -46,10 +46,10 @@
367
368 Warning: fileinode(): open_basedir restriction in effect. File(./../.) is not within the allowed path(s): (.) in %s on line %d
369 bool(false)
370-int(%d)
371-int(%d)
372-int(%d)
373-int(%d)
374-int(%d)
375+int(%i)
376+int(%i)
377+int(%i)
378+int(%i)
379+int(%i)
380 *** Finished testing open_basedir configuration [fileinode] ***
381
382--- php-5.3.3/ext/spl/tests/SplFileInfo_getInode_basic.phpt~ 2010-08-04 16:25:21.000000000 +0300
383+++ php-5.3.3/ext/spl/tests/SplFileInfo_getInode_basic.phpt 2010-08-04 16:28:32.722932851 +0300
384@@ -11,6 +11,7 @@
385 --SKIPIF--
386 <?php
387 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms");
388+if (PHP_INT_SIZE == 4) die("skip this test is for >32bit platform only (inodes overflow there)");
389 ?>
390 --FILE--
391 <?php
This page took 0.118612 seconds and 4 git commands to generate.