symfony-cli
diff --git a/‎local/php/envs.go
Lines changed: 8 additions & 8 deletions b/‎local/php/envs.go
Lines changed: 8 additions & 8 deletions
diff --git a/‎local/php/envs_test.go
Lines changed: 11 additions & 0 deletions b/‎local/php/envs_test.go
Lines changed: 11 additions & 0 deletions
@@ -29,23 +29,24 @@ import (
 	"github.com/symfony-cli/symfony-cli/envs"
 )
 
-func (p *Server) resolveIndexFile(pathInfo string) (string, string) {
-
+func (p *Server) resolveScriptName(pathInfo string) (string, string) {
 	if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {
 		file := pathInfo[:pos+4]
 		if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
 			return file, pathInfo[pos+4:]
 		}
-
 	}
 
 	if len(pathInfo) > 1 {
 		paths := strings.Split(strings.Trim(pathInfo, "/"), "/")
 		for n := len(paths); n > 0; n-- {
-			indexDir := filepath.Join(paths[:n]...)
-			file := filepath.Join(indexDir, p.passthru)
+			if paths[n-1] == "" {
+				continue
+			}
+
+			file := filepath.Join(append(paths[:n], p.passthru)...)
 			if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {
-				return "/" + file, pathInfo[strings.Index(pathInfo, indexDir)+len(indexDir):]
+				return "/" + file, pathInfo[strings.LastIndex(pathInfo, paths[n-1])+len(paths[n-1]):]
 			}
 		}
 	}
@@ -54,8 +55,7 @@ func (p *Server) resolveIndexFile(pathInfo string) (string, string) {
 }
 
 func (p *Server) generateEnv(req *http.Request) map[string]string {
-
-	scriptName, pathInfo := p.resolveIndexFile(req.URL.Path)
+	scriptName, pathInfo := p.resolveScriptName(req.URL.Path)
 
 	https := ""
 	if req.TLS != nil {
 
@@ -260,6 +260,17 @@ func (s *PHPFPMSuite) TestGenerateEnv(c *C) {
 				"SCRIPT_NAME":     "/subdirectory/index.php",
 			},
 		},
+		{
+			passthru: "/index.php",
+			uri:      "/subdirectory///subdirectory//foo/",
+			expected: map[string]string{
+				"PATH_INFO":       "//foo/",
+				"REQUEST_URI":     "/subdirectory///subdirectory//foo/",
+				"QUERY_STRING":    "",
+				"SCRIPT_FILENAME": testdataDir + "/public/subdirectory/subdirectory/index.php",
+				"SCRIPT_NAME":     "/subdirectory/subdirectory/index.php",
+			},
+		},
 	}
 	for _, test := range tests {
 		process := &Server{
Original file line number	Diff line number	Diff line change
`@@ -29,23 +29,24 @@ import (`
`29`	`29`	`"github.com/symfony-cli/symfony-cli/envs"`
`30`	`30`	`)`
`31`	`31`
`32`		`-func (p *Server) resolveIndexFile(pathInfo string) (string, string) {`
`33`		`-`
	`32`	`+func (p *Server) resolveScriptName(pathInfo string) (string, string) {`
`34`	`33`	`if pos := strings.Index(strings.ToLower(pathInfo), ".php"); pos != -1 {`
`35`	`34`	`file := pathInfo[:pos+4]`
`36`	`35`	`if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {`
`37`	`36`	`return file, pathInfo[pos+4:]`
`38`	`37`	`}`
`39`		`-`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`if len(pathInfo) > 1 {`
`43`	`41`	`paths := strings.Split(strings.Trim(pathInfo, "/"), "/")`
`44`	`42`	`for n := len(paths); n > 0; n-- {`
`45`		`- indexDir := filepath.Join(paths[:n]...)`
`46`		`- file := filepath.Join(indexDir, p.passthru)`
	`43`	`+ if paths[n-1] == "" {`
	`44`	`+ continue`
	`45`	`+ }`
	`46`	`+`
	`47`	`+ file := filepath.Join(append(paths[:n], p.passthru)...)`
`47`	`48`	`if _, err := os.Stat(filepath.Join(p.documentRoot, file)); err == nil {`
`48`		`- return "/" + file, pathInfo[strings.Index(pathInfo, indexDir)+len(indexDir):]`
	`49`	`+ return "/" + file, pathInfo[strings.LastIndex(pathInfo, paths[n-1])+len(paths[n-1]):]`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`}`
`@@ -54,8 +55,7 @@ func (p *Server) resolveIndexFile(pathInfo string) (string, string) {`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`func (p Server) generateEnv(req http.Request) map[string]string {`
`57`		`-`
`58`		`- scriptName, pathInfo := p.resolveIndexFile(req.URL.Path)`
	`58`	`+ scriptName, pathInfo := p.resolveScriptName(req.URL.Path)`
`59`	`59`
`60`	`60`	`https := ""`
`61`	`61`	`if req.TLS != nil {`