Request Handler: Urldecode the requested path

packages/php-wasm/node/src/test/php-request-handler.spec.ts

@@ -56,6 +56,49 @@ describe.each(SupportedPHPVersions)(
 			});
 		});
 
+		it('should serve a static file with urlencoded entities in the path', async () => {
+			php.writeFile(
+				'/Screenshot 2024-04-05 at 7.13.36 AM.html',
+				`Hello World`
+			);
+			const response = await handler.request({
+				url: '/Screenshot 2024-04-05 at 7.13.36%E2%80%AFAM.html',
+			});
+			expect(response).toEqual({
+				httpStatusCode: 200,
+				headers: {
+					'content-type': ['text/html'],
+
+					'accept-ranges': ['bytes'],
+					'cache-control': ['public, max-age=0'],
+					'content-length': ['11'],
+				},
+				bytes: new TextEncoder().encode('Hello World'),
+				errors: '',
+				exitCode: 0,
+			});
+		});
+
+		it('should serve a PHP file with urlencoded entities in the path', async () => {
+			php.writeFile(
+				'/Screenshot 2024-04-05 at 7.13.36 AM.php',
+				`Hello World`
+			);
+			const response = await handler.request({
+				url: '/Screenshot 2024-04-05 at 7.13.36%E2%80%AFAM.php',
+			});
+			expect(response).toEqual({
+				httpStatusCode: 200,
+				headers: {
+					'content-type': ['text/html; charset=UTF-8'],
+					'x-powered-by': [expect.any(String)],
+				},
+				bytes: new TextEncoder().encode('Hello World'),
+				errors: '',
+				exitCode: 0,
+			});
+		});
+
 		it('should yield x-file-type=static when a static file is not found', async () => {
 			const response = await handler.request({
 				url: '/index.html',

packages/php-wasm/universal/src/lib/php-request-handler.ts

@@ -1,4 +1,4 @@
-import { Semaphore } from '@php-wasm/util';
+import { Semaphore, joinPaths } from '@php-wasm/util';
 import {
 	ensurePathPrefix,
 	toRelativeUrl,
@@ -125,10 +125,13 @@ export class PHPRequestHandler implements RequestHandler {
 		);
 
 		const normalizedRequestedPath = applyRewriteRules(
-			removePathPrefix(requestedUrl.pathname, this.#PATHNAME),
+			removePathPrefix(
+				decodeURIComponent(requestedUrl.pathname),
+				this.#PATHNAME
+			),
 			this.rewriteRules
 		);
-		const fsPath = `${this.#DOCROOT}${normalizedRequestedPath}`;
+		const fsPath = joinPaths(this.#DOCROOT, normalizedRequestedPath);
 		if (seemsLikeAPHPRequestHandlerPath(fsPath)) {
 			return await this.#dispatchToPHP(request, requestedUrl);
 		}
@@ -228,7 +231,9 @@ export class PHPRequestHandler implements RequestHandler {
 
 			let scriptPath;
 			try {
-				scriptPath = this.#resolvePHPFilePath(requestedUrl.pathname);
+				scriptPath = this.#resolvePHPFilePath(
+					decodeURIComponent(requestedUrl.pathname)
+				);
 			} catch (error) {
 				return new PHPResponse(
 					404,