diff options
| author | Anatol Belski <ab@php.net> | 2018-05-13 18:42:36 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-05-13 18:42:36 +0200 |
| commit | 398204ace939b0cab16235e2680daa891495f157 (patch) | |
| tree | e9368d4b77304b67f4595d574e01ea7024048b7b /sapi | |
| parent | 41aa83f0c254922aedbe4845511c6b2862f4de26 (diff) | |
| parent | ad787626a427a2cc49ece694ab6efc63d48df903 (diff) | |
| download | php-git-398204ace939b0cab16235e2680daa891495f157.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
Diffstat (limited to 'sapi')
| -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 d971b86703..198afc8a6b 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -2013,9 +2013,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); } |