diff options
| author | Anatol Belski <ab@php.net> | 2017-08-14 00:51:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-08-14 00:51:47 +0200 |
| commit | 0a2a136111a410c58c4cab10c69eafafcf827fa0 (patch) | |
| tree | 4e0fe8ce11413d71897002435c95722484fd55ae /Zend/zend.c | |
| parent | 36eddfc785ad2db4293571eabb5fc5ac989bb8d8 (diff) | |
| parent | 3069ad8dd1400f19a28230d3028048a27d07ce8d (diff) | |
| download | php-git-0a2a136111a410c58c4cab10c69eafafcf827fa0.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75063
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 0f59704553..6adf73747b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -717,6 +717,10 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / extern zend_php_scanner_globals language_scanner_globals; #endif +#ifdef ZEND_WIN32 + php_win32_cp_set_by_id(65001); +#endif + start_memory_manager(); virtual_cwd_startup(); /* Could use shutdown to free the main cwd but it would just slow it down for CGI */ |