diff options
author | Marcus Boerger <helly@php.net> | 2008-12-31 14:27:09 +0000 |
---|---|---|
committer | Marcus Boerger <helly@php.net> | 2008-12-31 14:27:09 +0000 |
commit | f77719d8005ad3c0684ba1b40c83e8463b204b5a (patch) | |
tree | 78c79616b3ae24b8a61f466d1e5592872fce4150 /sapi/cli/php_cli.c | |
parent | 2faea53de22c3297bde373bdd3b4fd021a47caab (diff) | |
download | php-git-f77719d8005ad3c0684ba1b40c83e8463b204b5a.tar.gz |
MFH
- Changed dl() to be disabled by default. Enabled only when explicitly
registered by the SAPI layer. Enabled only with CLI, CGI and EMBED. (Dmitry)
[DOC]
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r-- | sapi/cli/php_cli.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 2b458a503c..519217fa24 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -426,6 +426,17 @@ static sapi_module_struct cli_sapi_module = { }; /* }}} */ +/* {{{ arginfo ext/standard/dl.c */ +ZEND_BEGIN_ARG_INFO(arginfo_dl, 0) + ZEND_ARG_INFO(0, extension_filename) +ZEND_END_ARG_INFO() +/* }}} */ + +static const zend_function_entry additional_functions[] = { + ZEND_FE(dl, arginfo_dl) + {NULL, NULL, NULL} +}; + /* {{{ php_cli_usage */ static void php_cli_usage(char *argv0) @@ -704,6 +715,7 @@ int main(int argc, char *argv[]) php_optarg = orig_optarg; cli_sapi_module.executable_location = argv[0]; + cli_sapi_module.additional_functions = additional_functions; /* startup after we get the above ini override se we get things right */ if (cli_sapi_module.startup(&cli_sapi_module)==FAILURE) { |