granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 41e1891 fd08f06)

author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 27 Jan 2020 12:32:29 +0000 (13:32 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 27 Jan 2020 12:32:38 +0000 (13:32 +0100)
commit	1cccbb8ff1339c44075e7dee8613d98dc8056f68
tree	3eb848778ca364b6a819b684b4ee6c694ef693c1	tree \| snapshot
parent	41e1891e0c2c4d9c3827d8e95dff735eee38268d	commit \| diff
parent	fd08f062ae5a3c92bfc0345da7e83ab320046864	commit \| diff

Merge branch 'PHP-7.3' into PHP-7.4

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

NEWS	diff1 \|	diff2 \|	blob \| history
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.