Skip to content

Commit a62ffb7

Browse files
dstogovdstogov
committed
Renamed Zend Optimizer+ into Zend OPcache
1 parent 840c0d6 commit a62ffb7

29 files changed

+57
-57
lines changed

‎ext/opcache/Optimizer/zend_optimizer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/Optimizer/zend_optimizer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/Optimizer/zend_optimizer_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/README

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
The Zend Optimizer+
2-
===================
1+
The Zend OPcache
2+
================
33

4-
The Zend Optimizer+ provides faster PHP execution through opcode caching and
4+
The Zend OPcache provides faster PHP execution through opcode caching and
55
optimization. It improves PHP performance by storing precompiled script
66
bytecode in the shared memory. This eliminates the stages of reading code from
77
the disk and compiling it on future access. In addition, it applies a few
@@ -10,7 +10,7 @@ bytecode optimization patterns that make code execution faster.
1010
Compatibility
1111
-------------
1212

13-
This version of Zend Optimizer+ is compatible with PHP 5.2.*, 5.3.*, 5.4.*
13+
This version of Zend OPcache is compatible with PHP 5.2.*, 5.3.*, 5.4.*
1414
and PHP-5.5 development branch. PHP 5.2 support may be removed in the future.
1515

1616
Quick Install
@@ -31,9 +31,9 @@ Quick Install
3131

3232
zend_extension=/...full path.../opcache.so
3333

34-
NOTE: In case you are going to use Zend Optimizer+ together with Xdebug,
35-
be sure that Xdebug is loaded after Optimizer+. "php -v" must show Xdebug
36-
after Optimizer+.
34+
NOTE: In case you are going to use Zend OPcache together with Xdebug,
35+
be sure that Xdebug is loaded after OPcache. "php -v" must show Xdebug
36+
after OPcache.
3737

3838
- Restart PHP
3939

@@ -63,17 +63,17 @@ Configuration Directives
6363
------------------------
6464

6565
opcache.enable (default "1")
66-
Optimizer+ On/Off switch. When set to Off, code is not optimized.
66+
OPcache On/Off switch. When set to Off, code is not optimized.
6767

6868
opcache.memory_consumption (default "64")
69-
The Optimizer+ shared memory storage size. The amount of memory for storing
69+
The OPcache shared memory storage size. The amount of memory for storing
7070
precompiled PHP code in Mbytes.
7171

7272
opcache.interned_strings_buffer (default "4")
7373
The amount of memory for interned strings in Mbytes.
7474

7575
opcache.max_accelerated_files (default "2000")
76-
The maximum number of keys (scripts) in the Optimizer+ hash table.
76+
The maximum number of keys (scripts) in the OPcache hash table.
7777
The number is actually the first one in the following set of prime
7878
numbers that is bigger than the one supplied: { 223, 463, 983, 1979, 3907,
7979
7963, 16229, 32531, 65407, 130987 }. Only numbers between 200 and 100000
@@ -83,13 +83,13 @@ opcache.max_wasted_percentage (default "5")
8383
The maximum percentage of "wasted" memory until a restart is scheduled.
8484

8585
opcache.use_cwd (default "1")
86-
When this directive is enabled, the Optimizer+ appends the current working
86+
When this directive is enabled, the OPcache appends the current working
8787
directory to the script key, thus eliminating possible collisions between
8888
files with the same name (basename). Disabling the directive improves
8989
performance, but may break existing applications.
9090

9191
opcache.validate_timestamps (default "1")
92-
When disabled, you must reset the Optimizer+ manually or restart the
92+
When disabled, you must reset the OPcache manually or restart the
9393
webserver for changes to the filesystem to take effect.
9494
The frequency of the check is controlled by the directive
9595
"opcache.revalidate_freq".
@@ -127,15 +127,15 @@ opcache.enable_file_override (default "0")
127127
Allow file existence override (file_exists, etc.) performance feature.
128128

129129
opcache.optimization_level (default "0xffffffff")
130-
A bitmask, where each bit enables or disables the appropriate Optimizer+
130+
A bitmask, where each bit enables or disables the appropriate OPcache
131131
passes
132132

133133
opcache.inherited_hack (default "1")
134134
Enable this hack as a workaround for "can't redeclare class" errors.
135-
The Optimizer+ stores the places where DECLARE_CLASS opcodes use
135+
The OPcache stores the places where DECLARE_CLASS opcodes use
136136
inheritance (These are the only opcodes that can be executed by PHP,
137137
but which may not be executed because the parent class is missing due to
138-
optimization). When the file is loaded, Optimizer+ tries to bind the
138+
optimization). When the file is loaded, OPcache tries to bind the
139139
inherited classes by using the current environment. The problem with this
140140
scenario is that, while the DECLARE_CLASS opcode may not be needed for the
141141
current script, if the script requires that the opcode at least be defined,
@@ -147,8 +147,8 @@ opcache.dups_fix (default "0")
147147
Enable this hack as a workaround for "Cannot redeclare class" errors.
148148

149149
opcache.blacklist_filename
150-
The location of the Optimizer+ blacklist file.
151-
The Optimizer+ blacklist file is a text file that holds the names of files
150+
The location of the OPcache blacklist file.
151+
The OPcache blacklist file is a text file that holds the names of files
152152
that should not be accelerated. The file format is to add each filename
153153
to a new line. The filename may be a full path or just a file prefix
154154
(i.e., /var/www/x blacklists all the files and directories in /var/www
@@ -157,7 +157,7 @@ opcache.blacklist_filename
157157
1) Directories that contain auto generated code, like Smarty or ZFW cache.
158158
2) Code that does not work well when accelerated, due to some delayed
159159
compile time evaluation.
160-
3) Code that triggers an Optimizer+ bug.
160+
3) Code that triggers an OPcache bug.
161161

162162
opcache.max_file_size (default "0")
163163
Allows exclusion of large files from being cached. By default all files
@@ -172,18 +172,18 @@ opcache.consistency_checks (default "0")
172172
opcache.force_restart_timeout (default "180")
173173
How long to wait (in seconds) for a scheduled restart to begin if the cache
174174
is not being accessed.
175-
The Optimizer+ uses this directive to identify a situation where there may
175+
The OPcache uses this directive to identify a situation where there may
176176
be a problem with a process. After this time period has passed, the
177-
Optimizer+ assumes that something has happened and starts killing the
177+
OPcache assumes that something has happened and starts killing the
178178
processes that still hold the locks that are preventing a restart.
179179
If the log level is 3 or above, a "killed locker" error is recorded
180180
in the Apache logs when this happens.
181181

182182
opcache.error_log
183-
Optimizer+ error_log file name. Empty string assumes "stderr".
183+
OPcache error_log file name. Empty string assumes "stderr".
184184

185185
opcache.log_verbosity_level (default "1")
186-
All Optimizer+ errors go to the Web server log.
186+
All OPcache errors go to the Web server log.
187187
By default, only fatal errors (level 0) or errors (level 1) are logged.
188188
You can also enable warnings (level 2), info messages (level 3) or
189189
debug messages (level 4).

‎ext/opcache/ZendAccelerator.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/ZendAccelerator.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+
@@ -26,15 +26,15 @@
2626
# include <config.h>
2727
#endif
2828

29-
#define ACCELERATOR_PRODUCT_NAME "Zend Optimizer+"
29+
#define ACCELERATOR_PRODUCT_NAME "Zend OPcache"
3030
#define ACCELERATOR_VERSION "7.0.1-dev"
3131
/* 2 - added Profiler support, on 20010712 */
3232
/* 3 - added support for Optimizer's encoded-only-files mode */
3333
/* 4 - works with the new Optimizer, that supports the file format with licenses */
3434
/* 5 - API 4 didn't really work with the license-enabled file format. v5 does. */
3535
/* 6 - Monitor was removed from ZendPlatform.so, to a module of its own */
3636
/* 7 - Optimizer was embedded into Accelerator */
37-
/* 8 - Standalone Open Source OptimizerPlus */
37+
/* 8 - Standalone Open Source Zend OPcache */
3838
#define ACCELERATOR_API_NO 8
3939

4040
#if ZEND_WIN32

‎ext/opcache/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dnl
22
dnl $Id$
33
dnl
44

5-
PHP_ARG_ENABLE(opcache, whether to enable Zend Optimizer+ support,
6-
[ --enable-opcache Enable Zend Optimizer+ support], yes)
5+
PHP_ARG_ENABLE(opcache, whether to enable Zend OPcache support,
6+
[ --enable-opcache Enable Zend OPcache support], yes)
77

88
if test "$PHP_OPCACHE" != "no"; then
99

‎ext/opcache/config.w32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG_ENABLE("opcache", "whether to enable Zend Optimizer+ support", "yes");
1+
ARG_ENABLE("opcache", "whether to enable Zend OPcache support", "yes");
22

33
if (PHP_OPCACHE != "no") {
44

‎ext/opcache/shared_alloc_mmap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/shared_alloc_posix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/shared_alloc_shm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/shared_alloc_win32.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+
@@ -26,11 +26,11 @@
2626
#include <process.h>
2727
#include <LMCONS.H>
2828

29-
#define ACCEL_FILEMAP_NAME "ZendOptimizer+.SharedMemoryArea"
30-
#define ACCEL_MUTEX_NAME "ZendOptimizer+.SharedMemoryMutex"
29+
#define ACCEL_FILEMAP_NAME "ZendOPcache.SharedMemoryArea"
30+
#define ACCEL_MUTEX_NAME "ZendOPcache.SharedMemoryMutex"
3131
#define ACCEL_FILEMAP_BASE_DEFAULT 0x01000000
32-
#define ACCEL_FILEMAP_BASE "ZendOptimizer+.MemoryBase"
33-
#define ACCEL_EVENT_SOURCE "Zend Optimizer+"
32+
#define ACCEL_FILEMAP_BASE "ZendOPcache.MemoryBase"
33+
#define ACCEL_EVENT_SOURCE "Zend OPcache"
3434

3535
static HANDLE memfile = NULL, memory_mutex = NULL;
3636
static void *mapping_base;

‎ext/opcache/tests/bug64353.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+)
2+
Bug #64353 (Built-in classes can be unavailable with dynamic includes and OPcache)
33
--INI--
44
allow_url_include=1
55
opcache.enable=1

‎ext/opcache/tests/skipif.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
2-
if (!extension_loaded('Zend Optimizer+')) die('skip ZendOptimizerPlus extension not available');
2+
if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available');
33
?>

‎ext/opcache/zend_accelerator_blacklist.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_blacklist.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_debug.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_debug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_hash.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_hash.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_module.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_module.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_util_funcs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_accelerator_util_funcs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_persist.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_persist.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_persist_calc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_shared_alloc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

‎ext/opcache/zend_shared_alloc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Zend Optimizer+ |
3+
| Zend OPcache |
44
+----------------------------------------------------------------------+
55
| Copyright (c) 1998-2013 The PHP Group |
66
+----------------------------------------------------------------------+

0 commit comments

Comments
 (0)