[2.x] Fixes missing server software environment variable (#101)

* Adds missing server software environment variable * Update Octane.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Oct 5, 2021 · 27711d8 · 27711d8
1 parent dd63851
commit 27711d8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Runtime/Octane/Octane.php b/src/Runtime/Octane/Octane.php
@@ -66,6 +66,8 @@ class Octane implements Client
      */
     public static function boot($basePath, $databaseSessionPersist = false, $databaseSessionTtl = 0)
     {
+        self::ensureServerSoftware('vapor');
+
         $databaseSessionTtl = (int) $databaseSessionTtl;
 
         static::$worker = tap(new Worker(
@@ -184,6 +186,8 @@ public static function terminate()
             static::$worker->terminate();
 
             static::$worker = null;
+
+            self::ensureServerSoftware(null);
         }
     }
 
@@ -241,4 +245,16 @@ public function error(Throwable $e, Application $app, Request $request, RequestC
             fwrite(STDERR, $e->getMessage());
         }
     }
+
+    /**
+     * Ensures the given software name is set globally.
+     *
+     * @param  string|null  $software
+     * @return void
+     */
+    protected static function ensureServerSoftware($software)
+    {
+        $_ENV['SERVER_SOFTWARE'] = $software;
+        $_SERVER['SERVER_SOFTWARE'] = $software;
+    }
 }
diff --git a/tests/Feature/OctaneTest.php b/tests/Feature/OctaneTest.php
@@ -69,4 +69,10 @@ public function test_on_error()
 
         Event::assertDispatched(WorkerErrorOccurred::class);
     }
+
+    public function test_server_software()
+    {
+        self::assertSame('vapor', $_ENV['SERVER_SOFTWARE']);
+        self::assertSame('vapor', $_SERVER['SERVER_SOFTWARE']);
+    }
 }