Commit 026d470

committed

sapi: Remove hardcoded register_argc_argv for CLI SAPIs

This INI is ignored since the previous commit, which makes the hardcoded setting obsolete.

1 parent 6ea0eb9 commit 026d470Copy full SHA for 026d470

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -662,7 +662,7 @@ request_order = "GP"`
`662`	`662`	`; enabled, registering these variables consumes CPU cycles and memory each time`
`663`	`663`	`; a script is executed. For security reasons, this feature should be disabled`
`664`	`664`	`; for non-CLI SAPIs.`
`665`		`-; Note: This directive is hardcoded to On for the CLI SAPI`
	`665`	`+; Note: This directive is ignored for the CLI SAPI`
`666`	`666`	`; This directive is deprecated.`
`667`	`667`	`; https://php.net/register-argc-argv`
`668`	`668`	`;register_argc_argv = Off`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ request_order = "GP"`
`664`	`664`	`; enabled, registering these variables consumes CPU cycles and memory each time`
`665`	`665`	`; a script is executed. For security reasons, this feature should be disabled`
`666`	`666`	`; for non-CLI SAPIs.`
`667`		`-; Note: This directive is hardcoded to On for the CLI SAPI`
	`667`	`+; Note: This directive is ignored for the CLI SAPI`
`668`	`668`	`; This directive is deprecated.`
`669`	`669`	`; https://php.net/register-argc-argv`
`670`	`670`	`;register_argc_argv = Off`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,6 @@ PHP_CLI_API cli_shell_callbacks_t *php_cli_get_shell_callbacks(void)`
`115`	`115`
`116`	`116`	`static const char HARDCODED_INI[] =`
`117`	`117`	`"html_errors=0\n"`
`118`		`- "register_argc_argv=1\n"`
`119`	`118`	`"implicit_flush=1\n"`
`120`	`119`	`"output_buffering=0\n"`
`121`	`120`	`"max_execution_time=0\n"`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`
`26`	`26`	`static const char HARDCODED_INI[] =`
`27`	`27`	`"html_errors=0\n"`
`28`		`- "register_argc_argv=1\n"`
`29`	`28`	`"implicit_flush=1\n"`
`30`	`29`	`"output_buffering=0\n"`
`31`	`30`	`"max_execution_time=0\n"`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -982,7 +982,6 @@ static const opt_struct OPTIONS[] = { /* {{{ */`
`982`	`982`
`983`	`983`	`const char phpdbg_ini_hardcoded[] =`
`984`	`984`	`"html_errors=Off\n"`
`985`		`-"register_argc_argv=On\n"`
`986`	`985`	`"implicit_flush=On\n"`
`987`	`986`	`"display_errors=Off\n"`
`988`	`987`	`"log_errors=On\n"`

Comments

(0)