CHANGE: keep / at the head of the HTTP request target (httpd module)

Oldes · Oldes · commit 3139f40e72fd · 2021-12-01T12:27:40.000+01:00
diff --git a/src/modules/httpd.reb b/src/modules/httpd.reb
@@ -80,7 +80,6 @@ decode-target: wrap [
 		][
 			target
 		][	any [result/file %""] ]
-		if #"/" = first result/file [remove result/file]
 		new-line/skip result/values true 2 
 		result
 	]
@@ -238,7 +237,7 @@ sys/make-scheme [
 			/local target path info index modified If-Modified-Since
 		][
 			target: ctx/inp/target
-			target/file: path: join dirize ctx/config/root  clean-path/only target/file
+			target/file: path: join dirize ctx/config/root next clean-path/only target/file
 			ctx/out/header/Date: to-idate/gmt now
 			ctx/out/status: 200
 			either exists? path [
@@ -352,13 +351,13 @@ sys/make-scheme [
 				return false
 			]
 			dir: target/file
-			path: find/match dir ctx/config/root
+			path: join "/" find/match/tail dir ctx/config/root
 		
 			try/except [
 				out: make string! 2000
 				append out ajoin [
-					{<html><head><title>Index of /}	path
-					{</title></head><body bgcolor="white"><h1>Index of /} path
+					{<html><head><title>Index of } path
+					{</title></head><body bgcolor="white"><h1>Index of } path
 					{</h1><hr><pre>^/}
 				]
 				unless empty? path [
diff --git a/src/tests/test-httpd.r3 b/src/tests/test-httpd.r3
@@ -49,27 +49,28 @@ http-server/config/actor 8081 [
 		; TRUE = accepted, FALSE = refuse
 		find [ 127.0.0.1 ] info/remote-ip 
 	]
-	On-Header: func [ctx [object!]][
-		switch ctx/inp/target/file [
-			%form/     [
+	On-Header: func [ctx [object!] /local path][
+		path: ctx/inp/target/file
+		switch path [
+			%/form/     [
 				; path rewrite...
 				; http://localhost:8081/form/ is now same like http://localhost:8081/form.html
-				ctx/inp/target/file: %form.html
+				ctx/inp/target/file: %/form.html
 				; request processing will continue
 			]
-			%form.htm
-			%form.html [
+			%/form.htm
+			%/form.html [
 				ctx/out/status: 301 ;= Moved Permanently
 				ctx/out/header/Location: %/form/
 				; request processing will stop with redirection response
 			]
-			%plain/ [
+			%/plain/ [
 				ctx/out/status: 200
 				ctx/out/header/Content-Type: "text/plain; charset=UTF-8"
 				ctx/out/content: "hello"
 				; request processing will stop with response 200 serving the plain text content
 			]
-			%humans.txt [
+			%/humans.txt [
 				;@@ https://codeburst.io/all-about-humans-humans-txt-actually-f571d37f92d2
 				;-- serving the content directly from the memory
 				ctx/out/status: 200
