http://localhost...

Author: henderkes

caddy/caddy_test.go

@@ -92,7 +92,6 @@ func TestWorker(t *testing.T) {
 		{
 			skip_install_trust
 			admin localhost:2999
-			http_port `+testPort+`
 			https_port 9443
 
 			frankenphp {
@@ -139,7 +138,7 @@ func TestGlobalAndLocalWorker(t *testing.T) {
 			}
 		}
 
-		localhost:`+testPort+` {
+		http://localhost:`+testPort+` {
 			route {
 				php {
 					root ../testdata
@@ -152,7 +151,7 @@ func TestGlobalAndLocalWorker(t *testing.T) {
 			}
 		}
 
-		localhost:`+testPortTwo+` {
+		http://localhost:`+testPortTwo+` {
 			route {
 				php {
 					root ../testdata
@@ -165,8 +164,8 @@ func TestGlobalAndLocalWorker(t *testing.T) {
 		wg.Add(1)
 
 		go func(i int) {
-			tester.AssertGetResponse("http://localhost:"+testPort+"/worker-with-env.php", http.StatusOK, fmt.Sprintf(fmt.Sprintf("Request %d has APP_ENV=%s", i, "local")))
-			tester.AssertGetResponse("http://localhost:"+testPortTwo+"/worker-with-env.php", http.StatusOK, fmt.Sprintf(fmt.Sprintf("Request %d has APP_ENV=%s", i, "global")))
+			tester.AssertGetResponse("http://localhost:"+testPort+"/worker-with-env.php", http.StatusOK, fmt.Sprintf(fmt.Sprintf("Worker has APP_ENV=%s", "local")))
+			tester.AssertGetResponse("http://localhost:"+testPortTwo+"/worker-with-env.php", http.StatusOK, fmt.Sprintf(fmt.Sprintf("Worker has APP_ENV=%s", "global")))
 			wg.Done()
 		}(i)
 	}

testdata/worker-with-env.php

@@ -4,7 +4,7 @@
 $env = $_SERVER['APP_ENV'];
 do {
     $ok = frankenphp_handle_request(function () use ($i, $env): void {
-        echo "Request $i has APP_ENV=$env";
+        echo "Worker has APP_ENV=$env";
     });
 
     $i++;