Skip to content

Commit 21c5af7

Browse files
committed
Remove dl() on fpm-fcgi
1 parent a1acbb8 commit 21c5af7

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

ext/standard/dl.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ PHPAPI PHP_FUNCTION(dl)
7070
RETURN_FALSE;
7171
}
7272

73-
if ((strncmp(sapi_module.name, "cgi", 3) != 0) &&
74-
(strcmp(sapi_module.name, "cli") != 0) &&
75-
(strncmp(sapi_module.name, "embed", 5) != 0)
76-
) {
77-
#ifdef ZTS
78-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not supported in multithreaded Web servers - use extension=%s in your php.ini", filename);
79-
RETURN_FALSE;
80-
#else
81-
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "dl() is deprecated - use extension=%s in your php.ini", filename);
82-
#endif
83-
}
84-
8573
php_dl(filename, MODULE_TEMPORARY, return_value, 0 TSRMLS_CC);
8674
if (Z_LVAL_P(return_value) == 1) {
8775
EG(full_tables_cleanup) = 1;

sapi/fpm/fpm/fpm_main.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -887,17 +887,6 @@ static sapi_module_struct cgi_sapi_module = {
887887
};
888888
/* }}} */
889889

890-
/* {{{ arginfo ext/standard/dl.c */
891-
ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
892-
ZEND_ARG_INFO(0, extension_filename)
893-
ZEND_END_ARG_INFO()
894-
/* }}} */
895-
896-
static const zend_function_entry additional_functions[] = {
897-
ZEND_FE(dl, arginfo_dl)
898-
{NULL, NULL, NULL}
899-
};
900-
901890
/* {{{ php_cgi_usage
902891
*/
903892
static void php_cgi_usage(char *argv0)
@@ -1774,7 +1763,7 @@ int main(int argc, char *argv[])
17741763
SG(request_info).path_translated = NULL;
17751764
#endif
17761765

1777-
cgi_sapi_module.additional_functions = additional_functions;
1766+
cgi_sapi_module.additional_functions = NULL;
17781767
cgi_sapi_module.executable_location = argv[0];
17791768

17801769
/* startup after we get the above ini override se we get things right */

0 commit comments

Comments
 (0)