]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)
* PHP-7.4:
  Fix bug #78323: Code 0 is returned on invalid options

1  2 
ext/standard/basic_functions.c
main/getopt.c
main/php_getopt.h
sapi/cgi/cgi_main.c
sapi/cli/php_cli.c
sapi/fpm/fpm/fpm_main.c

index 860c94acfbcf41b8da888863d8759758b1711953,a772cfc2756faf43e2f36bf28f28078aa89d005a..f6d513f53d224297ddc9fcde879dde324b942b4c
mode 100755,100644..100755
diff --cc main/getopt.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge