From e8e9acc8fce370f6d5b448461fe69b62e8797643 Mon Sep 17 00:00:00 2001
From: Bin Liu <binliu@fb.com>
Date: Wed, 17 Feb 2016 17:47:56 -0800
Subject: [PATCH] Fix native function name after adding namespace

Summary: Forgot to update registered function names after adding namespace.

Reviewed By: markw65

Differential Revision: D2945409

fb-gh-sync-id: 77c843e95e8461b8ce23a8348c15feedbbc0327d
shipit-source-id: 77c843e95e8461b8ce23a8348c15feedbbc0327d
---
 hphp/runtime/ext/server/ext_server.cpp            | 4 ++--
 hphp/test/server/http/server_root/test_status.php | 7 +++++++
 hphp/test/server/http/tests/runTest1.php          | 1 +
 hphp/test/server/http/tests/runTest1.php.expectf  | 5 ++++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 hphp/test/server/http/server_root/test_status.php

diff --git a/hphp/runtime/ext/server/ext_server.cpp b/hphp/runtime/ext/server/ext_server.cpp
index d45e86c1be043..d2eba3c2b6215 100644
--- a/hphp/runtime/ext/server/ext_server.cpp
+++ b/hphp/runtime/ext/server/ext_server.cpp
@@ -56,8 +56,8 @@ static struct ServerExtension final : Extension {
     HHVM_FE(xbox_set_thread_timeout);
     HHVM_FE(xbox_schedule_thread_reset);
     HHVM_FE(xbox_get_thread_time);
-    HHVM_FE(server_is_stopping);
-    HHVM_FE(server_uptime);
+    HHVM_FALIAS(HH\\server_is_stopping, server_is_stopping);
+    HHVM_FALIAS(HH\\server_uptime, server_uptime);
 
     loadSystemlib();
   }
diff --git a/hphp/test/server/http/server_root/test_status.php b/hphp/test/server/http/server_root/test_status.php
new file mode 100644
index 0000000000000..f79954128513f
--- /dev/null
+++ b/hphp/test/server/http/server_root/test_status.php
@@ -0,0 +1,7 @@
+<?php
+
+$uptime = HH\server_uptime();
+var_dump($uptime);
+
+$stopping = HH\server_is_stopping();
+var_dump($stopping);
diff --git a/hphp/test/server/http/tests/runTest1.php b/hphp/test/server/http/tests/runTest1.php
index 03bcaad224899..fb4ce6a72e40a 100644
--- a/hphp/test/server/http/tests/runTest1.php
+++ b/hphp/test/server/http/tests/runTest1.php
@@ -3,6 +3,7 @@
 require_once('test_base.inc');
 
 requestAll(array(
+  "test_status.php",
   "test_get.php?name=Foo",
   "test_get.php?name=Bar",
   "apc_apache_note.php",
diff --git a/hphp/test/server/http/tests/runTest1.php.expectf b/hphp/test/server/http/tests/runTest1.php.expectf
index f01929675dfcd..d99cf9b419d15 100644
--- a/hphp/test/server/http/tests/runTest1.php.expectf
+++ b/hphp/test/server/http/tests/runTest1.php.expectf
@@ -1,3 +1,6 @@
+Requesting 'test_status.php'
+string(%d) "int(%d)
+bool(false)"
 Requesting 'test_get.php?name=Foo'
 string(15) "string(3) "Foo""
 Requesting 'test_get.php?name=Bar'
@@ -71,4 +74,4 @@ array(5) {
   }
 }"
 Requesting 'test_curl_multi_except.php'
-string(%d) "Hello, World!%d:::Exception: oops"
\ No newline at end of file
+string(%d) "Hello, World!%d:::Exception: oops"