From d9432d6a509051692654ec5c00d71e5682ebe47e Mon Sep 17 00:00:00 2001
From: Lior Kaplan <kaplanlior@gmail.com>
Date: Mon, 16 Jun 2014 00:26:01 +0300
Subject: [PATCH 1/2] Fix typo in Bug #67406 NEWS entry

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index ffd8e5164c4..62830961192 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ PHP                                                                        NEWS
   . Fixed bug #67399 (putenv with empty variable may lead to crash). (Stas)
 
 - CLI server:
-  . Fixed Bug #67406i (built-in web-server segfaults on startup). (Remi)
+  . Fixed Bug #67406 (built-in web-server segfaults on startup). (Remi)
 
 - Date:
   . Fixed bug #67308 (Serialize of DateTime truncates fractions of second).

From a84a2d4ace577801d5e069ecd8d914150c6976f1 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 15 Jun 2014 23:51:51 +0200
Subject: [PATCH 2/2] Fixed wrong XFAIL test - already fixed

---
 tests/classes/bug63462.phpt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt
index dc5edbd5e19..f425c1526bc 100644
--- a/tests/classes/bug63462.phpt
+++ b/tests/classes/bug63462.phpt
@@ -2,8 +2,6 @@
 Test script to verify that magic methods should be called only once when accessing an unset property.
 --CREDITS--
 Marco Pivetta <ocramius@gmail.com>
---XFAIL--
-Bug 63462 is not yet fixed
 --FILE--
 <?php
 class Test {
@@ -20,7 +18,7 @@ class Test {
 	}
 
 	function __get($name) {
-		echo '__get ' . $name . "\n";
+		echo '__get ' . $name;
 		return $this->$name;
 	}
 
@@ -54,13 +52,13 @@ $test->privateProperty   = 'value';
 
 --EXPECTF--
 __get nonExisting
-Notice: Undefined index: nonExisting in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$nonExisting in %sbug63462.php on line %d
 __get publicProperty
-Notice: Undefined index: publicProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$publicProperty in %sbug63462.php on line %d
 __get protectedProperty
-Notice: Undefined index: protectedProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$protectedProperty in %sbug63462.php on line %d
 __get privateProperty
-Notice: Undefined index: privateProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$privateProperty in %sbug63462.php on line %d
 __isset nonExisting
 __isset publicProperty
 __isset protectedProperty