Remove dl() on fpm-fcgi

nikic · nikic · commit e05993dfa20e · 2015-01-26T21:00:23.000+01:00
diff --git a/NEWS b/NEWS
@@ -39,6 +39,7 @@
   . Removed support for #-style comments in ini files. (Nikita)
   . Removed support for assigning the result of new by reference. (Nikita)
   . Invalid octal literals in source code now produce compile errors, fixes PHPSadness #31. (Andrea)
+  . Removed dl() function on fpm-fcgi. (Nikita)
 
 - Date:
   . Fixed day_of_week function as it could sometimes return negative values
diff --git a/UPGRADING b/UPGRADING
@@ -66,6 +66,7 @@ PHP X.Y UPGRADE NOTES
   . Invalid octal literals in source code now produce compile errors, fixing
     PHPSadness #31. Previously, the invalid digits (and any following valid 
     digits) were simply ignored, such that 0781 became 7.
+  . Removed dl() function on fpm-fcgi.
 
 - Date:
   . Removed $is_dst parameter from mktime() and gmmktime().
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
@@ -70,18 +70,6 @@ PHPAPI PHP_FUNCTION(dl)
 		RETURN_FALSE;
 	}
 
-	if ((strncmp(sapi_module.name, "cgi", 3) != 0) &&
-		(strcmp(sapi_module.name, "cli") != 0) &&
-		(strncmp(sapi_module.name, "embed", 5) != 0)
-	) {
-#ifdef ZTS
-		php_error_docref(NULL, E_WARNING, "Not supported in multithreaded Web servers - use extension=%s in your php.ini", filename);
-		RETURN_FALSE;
-#else
-		php_error_docref(NULL, E_DEPRECATED, "dl() is deprecated - use extension=%s in your php.ini", filename);
-#endif
-	}
-
 	php_dl(filename, MODULE_TEMPORARY, return_value, 0);
 	if (Z_LVAL_P(return_value) == 1) {
 		EG(full_tables_cleanup) = 1;
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -838,17 +838,6 @@ static sapi_module_struct cgi_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_cgi_usage
  */
 static void php_cgi_usage(char *argv0)
@@ -1736,7 +1725,7 @@ int main(int argc, char *argv[])
 	SG(request_info).path_translated = NULL;
 #endif
 
-	cgi_sapi_module.additional_functions = additional_functions;
+	cgi_sapi_module.additional_functions = NULL;
 	cgi_sapi_module.executable_location = argv[0];
 
 	/* startup after we get the above ini override se we get things right */
