diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 09:41:47 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 09:41:47 +0200 |
| commit | c48611772dde23b98238ba295c7ddf836fa8ba76 (patch) | |
| tree | da810485013e01f46ee7a29ed6358d34af4a416d /main/main.c | |
| parent | a141ccb4ff7fb0666c7d7986c39feda9421291fe (diff) | |
| download | php-git-c48611772dde23b98238ba295c7ddf836fa8ba76.tar.gz | |
Remove the special disabled functions on Windows, since we don't even support those versions of Windows anymore hence it makes no sense to even check for it
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/main/main.c b/main/main.c index a7f3bad31e..c7468c2a96 100644 --- a/main/main.c +++ b/main/main.c @@ -126,34 +126,6 @@ php_core_globals core_globals; PHPAPI int core_globals_id; #endif -#ifdef PHP_WIN32 -#include "win32_internal_function_disabled.h" - -static int php_win32_disable_functions(void) -{ - int i; - - if (EG(windows_version_info).dwMajorVersion < 5) { - for (i = 0; i < function_name_cnt_5; i++) { - if (zend_hash_str_del(CG(function_table), function_name_5[i], strlen(function_name_5[i]))==FAILURE) { - php_printf("Unable to disable function '%s'\n", function_name_5[i]); - return FAILURE; - } - } - } - - if (EG(windows_version_info).dwMajorVersion < 6) { - for (i = 0; i < function_name_cnt_6; i++) { - if (zend_hash_str_del(CG(function_table), function_name_6[i], strlen(function_name_6[i]))==FAILURE) { - php_printf("Unable to disable function '%s'\n", function_name_6[i]); - return FAILURE; - } - } - } - return SUCCESS; -} -#endif - #define SAFE_FILENAME(f) ((f)?(f):"-") /* {{{ PHP_INI_MH @@ -2254,15 +2226,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod module->info_func = PHP_MINFO(php_core); } - -#ifdef PHP_WIN32 - /* Disable incompatible functions for the running platform */ - if (php_win32_disable_functions() == FAILURE) { - php_printf("Unable to disable unsupported functions\n"); - return FAILURE; - } -#endif - zend_post_startup(); module_initialized = 1; |