diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-03-29 01:32:44 +0100 |
| commit | cf099ba2ee4e438bae16c3670a14ce0c4390529a (patch) | |
| tree | 062683b6a7226ded35262e94c933b9bd81199314 /main | |
| parent | f21eff8954d5956842795ea5653a9a5b8d62caa3 (diff) | |
| download | php-cf099ba2ee4e438bae16c3670a14ce0c4390529a.tar.gz | |
Imported Upstream version 5.5.0~beta2upstream/5.5.0_beta2
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 4 | ||||
| -rw-r--r-- | main/win32_internal_function_disabled.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/main/php_version.h b/main/php_version.h index 61c507b32..04944aa63 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "beta1" -#define PHP_VERSION "5.5.0beta1" +#define PHP_EXTRA_VERSION "beta2" +#define PHP_VERSION "5.5.0beta2" #define PHP_VERSION_ID 50500 diff --git a/main/win32_internal_function_disabled.h b/main/win32_internal_function_disabled.h index 3a78f6c59..80fd8d1b8 100644 --- a/main/win32_internal_function_disabled.h +++ b/main/win32_internal_function_disabled.h @@ -23,12 +23,14 @@ /* Windows Server 2008 6.0 Windows Vista 6.0 + +Verssions below are not supported anymore, php won't even load: Windows Server 2003 R2 5.2 Windows Server 2003 5.2 Windows XP 5.1 Windows 2000 5.0 */ -static const char *function_name_5[] = {"link", NULL}; -const int function_name_cnt_5 = 1; +static const char *function_name_5[] = {NULL}; +const int function_name_cnt_5 = 0; static const char *function_name_6[] = {"readlink", "symlink", NULL}; const int function_name_cnt_6 = 2; |