From: Anatol Belski <ab@php.net>
Date: Wed, 18 Oct 2017 14:27:31 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC5~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5315cea6e276f96b8f44341df8527661dd6699ee;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
---

5315cea6e276f96b8f44341df8527661dd6699ee
diff --cc ext/opcache/zend_persist.h
index a87774a116,fc35eac5c8..f1a036b880
--- a/ext/opcache/zend_persist.h
+++ b/ext/opcache/zend_persist.h
@@@ -23,7 -23,7 +23,7 @@@
  #define ZEND_PERSIST_H
  
  int zend_accel_script_persistable(zend_persistent_script *script);
- uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length);
 -uint zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
++uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, char *key, unsigned int key_length, int for_shm);
  zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, char **key, unsigned int key_length);
  
  #endif /* ZEND_PERSIST_H */
diff --cc ext/opcache/zend_persist_calc.c
index cb7eb11b7a,e6726b82ed..232a26d12a
--- a/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@@ -395,7 -396,7 +395,7 @@@ static void zend_accel_persist_class_ta
  	zend_hash_persist_calc(class_table, zend_persist_class_entry_calc);
  }
  
- uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length)
 -uint zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int for_shm)
++uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, char *key, unsigned int key_length, int for_shm)
  {
  	new_persistent_script->mem = NULL;
  	new_persistent_script->size = 0;