Merge branch 'PHP-5.3' into PHP-5.4

weltling · weltling · commit 45977c6aae08 · 2012-04-16T14:39:39.000+02:00
* PHP-5.3:
  Fix bug 61683 tests\basic\bug20539.phpt fails
diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt
@@ -11,7 +11,8 @@ session.save_path=./tests/basic/
 <?php
 	print "good :)\n";
 	$filename = __DIR__ . '/sess_' . session_id();
-	var_dump(unlink($filename));
+	var_dump(file_exists($filename));
+	@unlink($filename);
 ?>
 --EXPECT--
 good :)
