summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-02-14 20:47:23 +0100
committerAnatol Belski <ab@php.net>2016-02-14 20:47:23 +0100
commitce4a2f0fc60309f429e4c04160a71befc283338a (patch)
treeef67b7da7f63d80b4e80ab877248135290c1d526 /sapi
parentfece24f8f4750d4fb75b89f8b9bd69046edeb5a9 (diff)
downloadphp-git-ce4a2f0fc60309f429e4c04160a71befc283338a.tar.gz
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/php_cli_server.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index f85d1265cf..169c05b88e 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -2058,6 +2058,19 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
return php_cli_server_send_error_page(server, client, 400 TSRMLS_CC);
}
+#ifdef PHP_WIN32
+ /* The win32 namespace will cut off trailing dots and spaces. Since the
+ VCWD functionality isn't used here, a sophisticated functionality
+ would have to be reimplemented to know ahead there are no files
+ with invalid names there. The simplest is just to forbid invalid
+ filenames, which is done here. */
+ if (client->request.path_translated &&
+ ('.' == client->request.path_translated[client->request.path_translated_len-1] ||
+ ' ' == client->request.path_translated[client->request.path_translated_len-1])) {
+ return php_cli_server_send_error_page(server, client, 500);
+ }
+#endif
+
fd = client->request.path_translated ? open(client->request.path_translated, O_RDONLY): -1;
if (fd < 0) {
return php_cli_server_send_error_page(server, client, 404 TSRMLS_CC);