granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3f67798 1cccbb8)

author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 27 Jan 2020 12:32:51 +0000 (13:32 +0100)
commit	16f194c75e05381628ae2b9468fb8004dec9e176
tree	fe16599af39275ddff3d73781daf9cbf59a0fd25	tree \| snapshot
parent	3f6779879cf7a293541ea10cd2852c9f45cbe73f	commit \| diff
parent	1cccbb8ff1339c44075e7dee8613d98dc8056f68	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
Fix bug #78323: Code 0 is returned on invalid options

ext/standard/basic_functions.c	diff1 \|	diff2 \|	blob \| history
main/getopt.c	diff1 \|	diff2 \|	blob \| history
main/php_getopt.h	diff1 \|	diff2 \|	blob \| history
sapi/cgi/cgi_main.c	diff1 \|	diff2 \|	blob \| history
sapi/cli/php_cli.c	diff1 \|	diff2 \|	blob \| history
sapi/fpm/fpm/fpm_main.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.