Skip to content

Commit 29a9e13

Browse files
committed
Merge branch 'PHP-5.5'
* PHP-5.5: (101 commits) Renamed ZendOptimizerPlus.so into opcache.so "ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+") More accurate restart scheduling Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0 Allow only shared O+ build Fixed typos add tests into package Add test script for #57 (segfaults in drupal7) fixed memory leaks Fixed Issue #57 (segfaults in drupal7) Fixed issue #58 (PHP-5.2 compatibility) Allows exclusion of large files from being cached Add maintainers inot package.xml fix ANSI C90 compat Fixed test Fixed uninitialized variable Fixed bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+) Save a stat() call by calling sapi_module.get_stat() Fixed #54 (PECL install adds extension= instead of zend_extension= to php.ini) release 7.0.0 ...
2 parents a3bb8ff + 34d3202 commit 29a9e13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+12507
-0
lines changed

ext/opcache/.gitignore

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# General Ignores
2+
*~
3+
.#*
4+
*.
5+
*.slo
6+
*.mk
7+
*.mem
8+
*.gcda
9+
*.gcno
10+
*.la
11+
*.lo
12+
*.o
13+
*.a
14+
*.ncb
15+
*.opt
16+
*.plg
17+
*swp
18+
*.patch
19+
*.tgz
20+
*.tar.gz
21+
*.tar.bz2
22+
.FBCIndex
23+
.FBCLockFolder
24+
.deps
25+
.libs
26+
phpt.*
27+
core
28+
dynlib.m4
29+
Debug
30+
Debug_TS
31+
Makefile
32+
Makefile.fragments
33+
Makefile.objects
34+
Makefile.global
35+
Release
36+
Release_TS
37+
Release_TSDbg
38+
Release_TS_inline
39+
Release_inline
40+
ZendEngine1
41+
_libs
42+
acconfig.h
43+
aclocal.m4
44+
acinclude.m4
45+
autom4te.cache
46+
bsd_converted
47+
buildconf.stamp
48+
buildmk.stamp
49+
confdefs.h
50+
config.h
51+
config.guess
52+
config.cache
53+
config.h.in
54+
config.log
55+
config.nice
56+
config.nice.bat
57+
config.status
58+
config.sub
59+
config_vars.mk
60+
configuration-parser.c
61+
configuration-parser.h
62+
configuration-parser.output
63+
configuration-scanner.c
64+
configure
65+
configure.in
66+
configure.bat
67+
configure.js
68+
conftest
69+
conftest.c
70+
debug.log
71+
diff
72+
generated_lists
73+
include
74+
install-sh
75+
internal_functions.c
76+
lcov_data
77+
lcov_html
78+
libs
79+
libtool
80+
ltmain.sh
81+
meta_cc
82+
meta_ccld
83+
missing
84+
mkinstalldirs
85+
modules
86+
build
87+
run-tests.php

ext/opcache/.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: php
2+
php:
3+
- 5.2
4+
- 5.3
5+
- 5.4
6+
- 5.5
7+
8+
before_script:
9+
- phpize
10+
- ./configure --enable-optimizer-plus
11+
- make
12+
13+
script:
14+
- php -d zend_extension=`pwd`/modules/ZendOptimizerPlus.so -m | grep "Zend Optimizer+"

ext/opcache/LICENSE

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
--------------------------------------------------------------------
2+
The PHP License, version 3.01
3+
Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
4+
--------------------------------------------------------------------
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, is permitted provided that the following conditions
8+
are met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
18+
3. The name "PHP" must not be used to endorse or promote products
19+
derived from this software without prior written permission. For
20+
written permission, please contact [email protected].
21+
22+
4. Products derived from this software may not be called "PHP", nor
23+
may "PHP" appear in their name, without prior written permission
24+
from [email protected]. You may indicate that your software works in
25+
conjunction with PHP by saying "Foo for PHP" instead of calling
26+
it "PHP Foo" or "phpfoo"
27+
28+
5. The PHP Group may publish revised and/or new versions of the
29+
license from time to time. Each version will be given a
30+
distinguishing version number.
31+
Once covered code has been published under a particular version
32+
of the license, you may always continue to use it under the terms
33+
of that version. You may also choose to use such covered code
34+
under the terms of any subsequent version of the license
35+
published by the PHP Group. No one other than the PHP Group has
36+
the right to modify the terms applicable to covered code created
37+
under this License.
38+
39+
6. Redistributions of any form whatsoever must retain the following
40+
acknowledgment:
41+
"This product includes PHP software, freely available from
42+
<http://www.php.net/software/>".
43+
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45+
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55+
OF THE POSSIBILITY OF SUCH DAMAGE.
56+
57+
--------------------------------------------------------------------
58+
59+
This software consists of voluntary contributions made by many
60+
individuals on behalf of the PHP Group.
61+
62+
The PHP Group can be contacted via Email at [email protected].
63+
64+
For more information on the PHP Group and the PHP project,
65+
please see <http://www.php.net>.
66+
67+
PHP includes the Zend Engine, freely available at
68+
<http://www.zend.com>.

0 commit comments

Comments
 (0)