bring back logic for workers to inherit php_server parent environment (#1956)

* bring back logic to inherit php_server parent environment

* change order to account for

php {
    worker file.php 1 {

    }
}
cases

* suggestion

* add inherit env test

Author: henderkes

caddy/caddy_test.go

@@ -168,6 +168,28 @@ func TestGlobalAndModuleWorker(t *testing.T) {
 	wg.Wait()
 }
 
+func TestModuleWorkerInheritsEnv(t *testing.T) {
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+		{
+			skip_install_trust
+			admin localhost:2999
+		}
+
+		http://localhost:`+testPort+` {
+			route {
+				php {
+					root ../testdata
+					env APP_ENV inherit_this
+					worker worker-with-env.php
+				}
+			}
+		}
+		`, "caddyfile")
+
+	tester.AssertGetResponse("http://localhost:"+testPort+"/worker-with-env.php", http.StatusOK, "Worker has APP_ENV=inherit_this")
+}
+
 func TestNamedModuleWorkers(t *testing.T) {
 	var wg sync.WaitGroup
 	testPortNum, _ := strconv.Atoi(testPort)

caddy/module.go

@@ -202,7 +202,6 @@ func (f *FrankenPHPModule) ServeHTTP(w http.ResponseWriter, r *http.Request, _ c
 
 // UnmarshalCaddyfile implements caddyfile.Unmarshaler.
 func (f *FrankenPHPModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
-	// First pass: Parse all directives except "worker"
 	for d.Next() {
 		for d.NextBlock(0) {
 			switch d.Val() {

caddy/workerconfig.go

@@ -139,7 +139,7 @@ func parseWorkerConfig(d *caddyfile.Dispenser) (workerConfig, error) {
 	return wc, nil
 }
 
-func (wc workerConfig) inheritEnv(env map[string]string) {
+func (wc *workerConfig) inheritEnv(env map[string]string) {
 	if wc.Env == nil {
 		wc.Env = make(map[string]string, len(env))
 	}
@@ -151,7 +151,7 @@ func (wc workerConfig) inheritEnv(env map[string]string) {
 	}
 }
 
-func (wc workerConfig) matchesPath(r *http.Request, documentRoot string) bool {
+func (wc *workerConfig) matchesPath(r *http.Request, documentRoot string) bool {
 
 	// try to match against a pattern if one is assigned
 	if len(wc.MatchPath) != 0 {