This only make sense on *nix

diff --git a/ext/opcache/README b/ext/opcache/README
index 11c9c2748bf0feaf626b35853735bd76c9aadf61..e4d36ba51a189b85756f2fb1f915321c943fcaa6 100644 (file)
--- a/ext/opcache/README
+++ b/ext/opcache/README
@@ -215,4 +215,4 @@ opcache.mmap_base
        errors.
 
 opcache.lockfile_path (default "/tmp")
-       Absolute path used to store shared lockfiles.
+       Absolute path used to store shared lockfiles (for *nix only)

diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index 42a34aa72b1680af457aea2e0deb6746cda68261..f5d7af5bf63fb88b4455cd9026bee09c6b74eb86 100644 (file)
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -217,7 +217,9 @@ typedef struct _zend_accel_directives {
        zend_long           max_file_size;
        zend_long           interned_strings_buffer;
        char          *restrict_api;
+#ifndef ZEND_WIN32
        char          *lockfile_path;
+#endif
 #ifdef HAVE_OPCACHE_FILE_CACHE
        char          *file_cache;
        zend_bool      file_cache_only;

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index e8c274e5160736f346ca43d9a9327afd0b8edff6..219d25bf2fa0f319f2bc77d2d6c66e43616dc218 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -298,9 +298,10 @@ ZEND_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("opcache.enable_cli"             , "0"   , PHP_INI_SYSTEM, OnUpdateBool,              accel_directives.enable_cli,                zend_accel_globals, accel_globals)
        STD_PHP_INI_ENTRY("opcache.error_log"                , ""    , PHP_INI_SYSTEM, OnUpdateString,           accel_directives.error_log,                 zend_accel_globals, accel_globals)
        STD_PHP_INI_ENTRY("opcache.restrict_api"             , ""    , PHP_INI_SYSTEM, OnUpdateString,           accel_directives.restrict_api,              zend_accel_globals, accel_globals)
-       STD_PHP_INI_ENTRY("opcache.lockfile_path"             , "/tmp"    , PHP_INI_SYSTEM, OnUpdateString,           accel_directives.lockfile_path,              zend_accel_globals, accel_globals)
 
-#ifdef ZEND_WIN32
+#ifndef ZEND_WIN32
+       STD_PHP_INI_ENTRY("opcache.lockfile_path"             , "/tmp"    , PHP_INI_SYSTEM, OnUpdateString,           accel_directives.lockfile_path,              zend_accel_globals, accel_globals)
+#else
        STD_PHP_INI_ENTRY("opcache.mmap_base", NULL, PHP_INI_SYSTEM,    OnUpdateString,                              accel_directives.mmap_base,                 zend_accel_globals, accel_globals)
 #endif
 
@@ -711,7 +712,10 @@ static ZEND_FUNCTION(opcache_get_configuration)
        add_assoc_bool(&directives,   "opcache.fast_shutdown",          ZCG(accel_directives).fast_shutdown);
        add_assoc_bool(&directives,   "opcache.enable_file_override",   ZCG(accel_directives).file_override_enabled);
        add_assoc_long(&directives,      "opcache.optimization_level",     ZCG(accel_directives).optimization_level);
+
+#ifndef ZEND_WIN32
        add_assoc_string(&directives, "opcache.lockfile_path",          STRING_NOT_NULL(ZCG(accel_directives).lockfile_path));
+#endif
 
 #ifdef HAVE_OPCACHE_FILE_CACHE
        add_assoc_string(&directives, "opcache.file_cache",                    ZCG(accel_directives).file_cache ? ZCG(accel_directives).file_cache : "");