Proxygen fixes

facebookarchive · Jun 4, 2015 · 0af3fff · 0af3fff
1 parent bf6e593
commit 0af3fff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/base/HHVMDaemon.php b/base/HHVMDaemon.php
@@ -71,6 +71,7 @@ protected function getArguments(): Vector<string> {
       '-v', 'AdminServer.Port='.PerfSettings::BackendAdminPort(),
       '-v', 'Server.Type='.$this->serverType,
       '-v', 'Server.DefaultDocument=index.php',
+      '-v', 'Server.ErrorDocument404=index.php',
       '-v', 'Server.SourceRoot='.$this->target->getSourceRoot(),
       '-v', 'Eval.Jit=1',
       '-d', 'pid='.escapeshellarg($this->getPidFilePath()),

diff --git a/base/NginxDaemon.php b/base/NginxDaemon.php
@@ -126,11 +126,11 @@ protected function getGeneratedConfigFile(): string {
 
     if ($this->options->proxygen) {
       $proxy_pass = sprintf(
-        'proxy_pass http://127.0.0.1:%d',
+        'proxy_pass http://127.0.0.1:%d$request_uri',
         PerfSettings::BackendPort(),
       );
       $admin_proxy_pass = sprintf(
-        'proxy_pass http://127.0.0.1:%d',
+        'proxy_pass http://127.0.0.1:%d$request_uri',
         PerfSettings::BackendAdminPort(),
       );
     } else {