diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-27 13:32:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-27 13:32:51 +0100 |
| commit | 16f194c75e05381628ae2b9468fb8004dec9e176 (patch) | |
| tree | fe16599af39275ddff3d73781daf9cbf59a0fd25 /sapi/cgi/cgi_main.c | |
| parent | 3f6779879cf7a293541ea10cd2852c9f45cbe73f (diff) | |
| parent | 1cccbb8ff1339c44075e7dee8613d98dc8056f68 (diff) | |
| download | php-git-16f194c75e05381628ae2b9468fb8004dec9e176.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #78323: Code 0 is returned on invalid options
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 10f92d9fd3..2cff48fc61 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2283,6 +2283,7 @@ parent_loop_end: break; case 'h': case '?': + case PHP_GETOPT_INVALID_ARG: if (request) { fcgi_destroy_request(request); } @@ -2292,6 +2293,9 @@ parent_loop_end: php_cgi_usage(argv[0]); php_output_end_all(); exit_status = 0; + if (c == PHP_GETOPT_INVALID_ARG) { + exit_status = 1; + } goto out; } } |