Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Accorate handling of too big inodes of chroot directories

diff --cc ext/opcache/ZendAccelerator.c
index 230cc3d20c0a84b87d0a1b78b146a8e8a7f4ff76,7e8a444e7fce4a6dbf7219a2452dbf9c854e885b..1491c88097b8047a32a309e408551d159aa60ae5
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -2091,18 -2155,14 +2091,16 @@@ static void accel_activate(void
                if (stat("/", &buf) != 0) {
                        ZCG(root_hash) = 0;
                } else {
-                       zend_ulong x = buf.st_ino;
- 
- #if SIZEOF_ZEND_LONG == 4
-                       x = ((x >> 16) ^ x) * 0x45d9f3b;
-                       x = ((x >> 16) ^ x) * 0x45d9f3b;
-                       x = (x >> 16) ^ x;
- #elif SIZEOF_ZEND_LONG == 8
-                       x = (x ^ (x >> 30)) * 0xbf58476d1ce4e5b9;
-                       x = (x ^ (x >> 27)) * 0x94d049bb133111eb;
-                       x = x ^ (x >> 31);
- #endif
-                       ZCG(root_hash) = x;
+                       ZCG(root_hash) = buf.st_ino;
+                       if (sizeof(buf.st_ino) > sizeof(ZCG(root_hash))) {
+                               if (ZCG(root_hash) != buf.st_ino) {
 -                                      zend_alter_ini_entry("opcache.enable", sizeof("opcache.enable"), "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);
++                                      zend_string *key = zend_string_init("opcache.enable", sizeof("opcache.enable")-1, 0);
++                                      zend_alter_ini_entry_chars(key, "0", 1, ZEND_INI_SYSTEM, ZEND_INI_STAGE_RUNTIME);
++                                      zend_string_release(key);
+                                       zend_accel_error(ACCEL_LOG_WARNING, "Can't cache files in chroot() directory with too big inode");
+                                       return;
+                               }
+                       }
                }
        } else {
                ZCG(root_hash) = 0;