]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 10 Apr 2019 13:31:24 +0000 (15:31 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 10 Apr 2019 13:31:24 +0000 (15:31 +0200)
1  2 
ext/opcache/ZendAccelerator.c
ext/opcache/zend_shared_alloc.c

Simple merge
index b441392993c46a37f8de8a575d2544f3730b4dcc,e4e44c35be02a90282b56b24310bac5c278ea0c1..ade01af4f5313e3718c4159eb8db60817c6b1f6d
@@@ -609,8 -592,27 +609,27 @@@ void zend_accel_shared_protect(int mode
        }
  
        for (i = 0; i < ZSMMG(shared_segments_count); i++) {
 -              mprotect(ZSMMG(shared_segments)[i]->p, ZSMMG(shared_segments)[i]->size, mode);
 +              mprotect(ZSMMG(shared_segments)[i]->p, ZSMMG(shared_segments)[i]->end, mode);
        }
+ #elif defined(ZEND_WIN32)
+       int i;
+       if (!smm_shared_globals) {
+               return;
+       }
+       if (mode) {
+               mode = PAGE_READONLY;
+       } else {
+               mode = PAGE_READWRITE;
+       }
+       for (i = 0; i < ZSMMG(shared_segments_count); i++) {
+               DWORD oldProtect;
+               if (!VirtualProtect(ZSMMG(shared_segments)[i]->p, ZSMMG(shared_segments)[i]->size, mode, &oldProtect)) {
+                       zend_accel_error(ACCEL_LOG_ERROR, "Failed to protect memory");
+               }
+       }
  #endif
  }