gistfile1.txt

diff --git i/hphp/runtime/server/http-protocol.cpp w/hphp/runtime/server/http-protocol.cpp
index 205ab06..cc0342d 100644
--- i/hphp/runtime/server/http-protocol.cpp
+++ w/hphp/runtime/server/http-protocol.cpp
@@ -558,7 +558,10 @@ void HttpProtocol::CopyPathInfo(Variant& server,
     server.set(s_SCRIPT_NAME, r.resolvedURL());
   }
 
-  if (r.rewritten()) {
+  auto scriptFilename = transport->getPathTranslated();
+  if (!scriptFilename.empty()) {
+    server.set(s_PHP_SELF, scriptFilename);
+  } else if (r.rewritten()) {
     server.set(s_PHP_SELF, r.originalURL());
   } else {
     server.set(s_PHP_SELF, r.resolvedURL() + r.origPathInfo());