Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75063

diff --cc Zend/zend.c
Simple merge

diff --cc Zend/zend_virtual_cwd.c
index e9ffda7cc30e09536606b093e788eb4343ba5dbb,2fa12f81808e9dbaae5aa638b851b93c9541a520..3e95795b084b7f4be8b0e65ebc4dd76488ae2cab
--- 1/Zend/zend_virtual_cwd.c
--- 2/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@@ -394,12 -450,27 +394,17 @@@ void virtual_cwd_main_cwd_init(uint8_t 
        char cwd[MAXPATHLEN];
        char *result;
  
+       if (reinit) {
+               free(main_cwd_state.cwd);
+       }
  
 -#ifdef NETWARE
 -      result = getcwdpath(cwd, NULL, 1);
 -      if(result)
 -      {
 -              char *c=cwd;
 -              while(c = strchr(c, '\\'))
 -              {
 -                      *c='/';
 -                      ++c;
 -              }
 -      }
 -#elif defined(ZEND_WIN32)
 +#ifdef ZEND_WIN32
        ZeroMemory(&cwd, sizeof(cwd));
- #endif
+       result = php_win32_ioutil_getcwd(cwd, sizeof(cwd));
+ #else
        result = getcwd(cwd, sizeof(cwd));
+ #endif
 +
        if (!result) {
                cwd[0] = '\0';
        }

diff --cc Zend/zend_virtual_cwd.h
Simple merge

diff --cc main/main.c
Simple merge