diff options
| author | Anatol Belski <ab@php.net> | 2018-05-13 18:43:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-13 18:43:12 +0200 |
| commit | 038a2e47564e7d46e7da3d97b33d733f7951c743 (patch) | |
| tree | e320e4d11a9c882c84890ffbf47b32a82ef4a1d2 /sapi/cli/php_cli_server.c | |
| parent | 2a2bf97a9a31d593557d5dc81d02fb93f38d6d58 (diff) | |
| parent | 398204ace939b0cab16235e2680daa891495f157 (diff) | |
| download | php-git-038a2e47564e7d46e7da3d97b33d733f7951c743.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 34cbf305ea..6fa1f4d1bb 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2016,9 +2016,11 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv ' ' == 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 ? php_win32_ioutil_open(client->request.path_translated, O_RDONLY): -1; +#else fd = client->request.path_translated ? open(client->request.path_translated, O_RDONLY): -1; +#endif if (fd < 0) { return php_cli_server_send_error_page(server, client, 404); } |