]> granicus.if.org Git - php/commitdiff
Merge Zend Optimizer+
authorDmitry Stogov <dmitry@zend.com>
Fri, 15 Mar 2013 20:41:46 +0000 (00:41 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 15 Mar 2013 20:41:46 +0000 (00:41 +0400)
git-subtree-dir: ext/opcache
git-subtree-mainline: b1dbfb73571b051fef055dc371e05163cf73eb8b
git-subtree-split: 8d35170c5fe9b9c0c864b7a6c4dc6b0149809569

44 files changed:
1  2 
ext/opcache/.gitignore
ext/opcache/.travis.yml
ext/opcache/LICENSE
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/nop_removal.c
ext/opcache/Optimizer/optimize_temp_vars_5.c
ext/opcache/Optimizer/pass10.c
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/pass2.c
ext/opcache/Optimizer/pass3.c
ext/opcache/Optimizer/pass5.c
ext/opcache/Optimizer/pass9.c
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.h
ext/opcache/Optimizer/zend_optimizer_internal.h
ext/opcache/README
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/config.m4
ext/opcache/config.w32
ext/opcache/package.xml
ext/opcache/shared_alloc_mmap.c
ext/opcache/shared_alloc_posix.c
ext/opcache/shared_alloc_shm.c
ext/opcache/shared_alloc_win32.c
ext/opcache/tests/001_cli.phpt
ext/opcache/tests/bug64353.phpt
ext/opcache/tests/issue0057.phpt
ext/opcache/tests/skipif.inc
ext/opcache/zend_accelerator_blacklist.c
ext/opcache/zend_accelerator_blacklist.h
ext/opcache/zend_accelerator_debug.c
ext/opcache/zend_accelerator_debug.h
ext/opcache/zend_accelerator_hash.c
ext/opcache/zend_accelerator_hash.h
ext/opcache/zend_accelerator_module.c
ext/opcache/zend_accelerator_module.h
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_accelerator_util_funcs.h
ext/opcache/zend_persist.c
ext/opcache/zend_persist.h
ext/opcache/zend_persist_calc.c
ext/opcache/zend_shared_alloc.c
ext/opcache/zend_shared_alloc.h

index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..8f2bec9d3ab5985953a506e57369b2027acabb23
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,87 @@@
++# General Ignores
++*~
++.#*
++*.
++*.slo
++*.mk
++*.mem
++*.gcda
++*.gcno
++*.la
++*.lo
++*.o
++*.a
++*.ncb
++*.opt
++*.plg
++*swp
++*.patch
++*.tgz
++*.tar.gz
++*.tar.bz2
++.FBCIndex
++.FBCLockFolder
++.deps
++.libs
++phpt.*
++core
++dynlib.m4
++Debug
++Debug_TS
++Makefile
++Makefile.fragments
++Makefile.objects
++Makefile.global
++Release
++Release_TS
++Release_TSDbg
++Release_TS_inline
++Release_inline
++ZendEngine1
++_libs
++acconfig.h
++aclocal.m4
++acinclude.m4
++autom4te.cache
++bsd_converted
++buildconf.stamp
++buildmk.stamp
++confdefs.h
++config.h
++config.guess
++config.cache
++config.h.in
++config.log
++config.nice
++config.nice.bat
++config.status
++config.sub
++config_vars.mk
++configuration-parser.c
++configuration-parser.h
++configuration-parser.output
++configuration-scanner.c
++configure
++configure.in
++configure.bat
++configure.js
++conftest
++conftest.c
++debug.log
++diff
++generated_lists
++include
++install-sh
++internal_functions.c
++lcov_data
++lcov_html
++libs
++libtool
++ltmain.sh
++meta_cc
++meta_ccld
++missing
++mkinstalldirs
++modules
++build
++run-tests.php
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b876f57d30fb760e1867f004ace31a129d39b15c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,14 @@@
++language: php
++php:
++  - 5.2
++  - 5.3
++  - 5.4
++  - 5.5
++
++before_script:
++  - phpize
++  - ./configure --enable-optimizer-plus
++  - make
++
++script:
++  - php -d zend_extension=`pwd`/modules/ZendOptimizerPlus.so -m | grep "Zend Optimizer+"
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..42536af320686a4d5b16e87430177de53516cbd1
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,68 @@@
++-------------------------------------------------------------------- 
++                  The PHP License, version 3.01
++Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
++-------------------------------------------------------------------- 
++
++Redistribution and use in source and binary forms, with or without
++modification, is permitted provided that the following conditions
++are met:
++
++  1. Redistributions of source code must retain the above copyright
++     notice, this list of conditions and the following disclaimer.
++ 
++  2. Redistributions in binary form must reproduce the above copyright
++     notice, this list of conditions and the following disclaimer in
++     the documentation and/or other materials provided with the
++     distribution.
++ 
++  3. The name "PHP" must not be used to endorse or promote products
++     derived from this software without prior written permission. For
++     written permission, please contact group@php.net.
++  
++  4. Products derived from this software may not be called "PHP", nor
++     may "PHP" appear in their name, without prior written permission
++     from group@php.net.  You may indicate that your software works in
++     conjunction with PHP by saying "Foo for PHP" instead of calling
++     it "PHP Foo" or "phpfoo"
++ 
++  5. The PHP Group may publish revised and/or new versions of the
++     license from time to time. Each version will be given a
++     distinguishing version number.
++     Once covered code has been published under a particular version
++     of the license, you may always continue to use it under the terms
++     of that version. You may also choose to use such covered code
++     under the terms of any subsequent version of the license
++     published by the PHP Group. No one other than the PHP Group has
++     the right to modify the terms applicable to covered code created
++     under this License.
++
++  6. Redistributions of any form whatsoever must retain the following
++     acknowledgment:
++     "This product includes PHP software, freely available from
++     <http://www.php.net/software/>".
++
++THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
++ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
++PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
++DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
++INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
++SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
++ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
++OF THE POSSIBILITY OF SUCH DAMAGE.
++
++-------------------------------------------------------------------- 
++
++This software consists of voluntary contributions made by many
++individuals on behalf of the PHP Group.
++
++The PHP Group can be contacted via Email at group@php.net.
++
++For more information on the PHP Group and the PHP project, 
++please see <http://www.php.net>.
++
++PHP includes the Zend Engine, freely available at
++<http://www.zend.com>.
index 0000000000000000000000000000000000000000,3d4bb0c1d27320cbdbbf4b5814f4b1d9800125b5..3d4bb0c1d27320cbdbbf4b5814f4b1d9800125b5
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,b2fb667ed55573c4fd65a5c314bd112c07c986d8..b2fb667ed55573c4fd65a5c314bd112c07c986d8
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,dc630733faadd5559002ba684f51427f831adef2..dc630733faadd5559002ba684f51427f831adef2
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,3bfcec643a6649bee234043f7736421697ed3e90..3bfcec643a6649bee234043f7736421697ed3e90
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,8938e148ce5c69d30ebfe90369f61cd45080065a..8938e148ce5c69d30ebfe90369f61cd45080065a
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,30708a0935baa6493ad30da1a85fbfa161fa1cea..30708a0935baa6493ad30da1a85fbfa161fa1cea
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,fd2a190009738163566ee2ee85ffcd0b69d95de6..fd2a190009738163566ee2ee85ffcd0b69d95de6
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,b0d651a5fcf8e5bff5c35ec17b893fdac7be0825..b0d651a5fcf8e5bff5c35ec17b893fdac7be0825
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,586160c14d10d30911f68203837515b8b5c12b8f..586160c14d10d30911f68203837515b8b5c12b8f
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,e46e5a2ececb6a8358835a3533c5f787aba91ddc..e46e5a2ececb6a8358835a3533c5f787aba91ddc
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,ff848535d30af797f53ea8b71487d09a16417c51..ff848535d30af797f53ea8b71487d09a16417c51
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,6f853641fac30fd1c02846f98b64ab1f326d1112..6f853641fac30fd1c02846f98b64ab1f326d1112
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,e7df8769b674c2c2ff6931226b894ce76fa9bccf..e7df8769b674c2c2ff6931226b894ce76fa9bccf
mode 000000,100644..100644
--- /dev/null
--- 2/README
index 0000000000000000000000000000000000000000,17eac09caf8e7c5b5c8a1f676910cce6aab80b9c..17eac09caf8e7c5b5c8a1f676910cce6aab80b9c
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,be2218cdb8d934c41322e0e28fcaa259ef9875e4..be2218cdb8d934c41322e0e28fcaa259ef9875e4
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,4e41c8bc19125507b1bec3794b81a9d4284af7c2..4e41c8bc19125507b1bec3794b81a9d4284af7c2
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,aeca78a77bb9d6918aecedb34fdd7a9d41b6c0b9..aeca78a77bb9d6918aecedb34fdd7a9d41b6c0b9
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,b890a2dda7ebb0da1233660889ee329ad4354b05..b890a2dda7ebb0da1233660889ee329ad4354b05
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,961f4fea9afd6a3d93df123dbf1d9ef27f6b0b5a..961f4fea9afd6a3d93df123dbf1d9ef27f6b0b5a
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,46f0257bb3aa851d424d811d1731b64b4ef2584b..46f0257bb3aa851d424d811d1731b64b4ef2584b
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,a8b244aac15196dd575988590d456fa6d796c2c0..a8b244aac15196dd575988590d456fa6d796c2c0
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,7eb93af62f2292299fdeb5fa5c6f468771b37c29..7eb93af62f2292299fdeb5fa5c6f468771b37c29
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,6c42049038ca80fdd5617588b8a7379350b43d43..6c42049038ca80fdd5617588b8a7379350b43d43
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,a4e1dabc250dbb81c1914b07765133f10419718f..a4e1dabc250dbb81c1914b07765133f10419718f
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,1ef3cbb8e2639fb2530f468ba9162f511dab9eaa..1ef3cbb8e2639fb2530f468ba9162f511dab9eaa
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,8652a94de74b42e882b89810120fc76ed230f257..8652a94de74b42e882b89810120fc76ed230f257
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,87dc4744574f11e8a7ac41f906f4d3f4c3c101a9..87dc4744574f11e8a7ac41f906f4d3f4c3c101a9
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,5d7730f470132618056eeee6e050ea407e6dc321..5d7730f470132618056eeee6e050ea407e6dc321
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,1234c0fc93ca4ca1f2c5e9740ea4452d942c9c99..1234c0fc93ca4ca1f2c5e9740ea4452d942c9c99
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,8d0d7320bf55dbb8d674dd28e6eafade0a8a0f55..8d0d7320bf55dbb8d674dd28e6eafade0a8a0f55
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,dbdc2ef1405568c6fcb973a0c88e5ae7ea0bbcef..dbdc2ef1405568c6fcb973a0c88e5ae7ea0bbcef
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,a1a836c03c3f5e117d6db3309807793d479be44c..a1a836c03c3f5e117d6db3309807793d479be44c
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,e55884aba1e8994033cd411af392340ad000af64..e55884aba1e8994033cd411af392340ad000af64
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,5ac5716ca7ce2e43a1076511ed8cc82ba0f77f02..5ac5716ca7ce2e43a1076511ed8cc82ba0f77f02
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,06299d8a0bf607173ff54fe99b6765b3aaa5f559..06299d8a0bf607173ff54fe99b6765b3aaa5f559
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,804e0f786b359c0663466bcc60f4bfe46ba215c2..804e0f786b359c0663466bcc60f4bfe46ba215c2
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,6f9678e2850f44af430084f43267b844f5a6e3b5..6f9678e2850f44af430084f43267b844f5a6e3b5
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,ffb990ae751b96282cde9e60d21f104a92eaf6e3..ffb990ae751b96282cde9e60d21f104a92eaf6e3
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,00c8784a84b74a6ef50dbb7f19c40fd859a9cfc9..00c8784a84b74a6ef50dbb7f19c40fd859a9cfc9
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,1a983aeea702fc90359d1844617f2fd28a4aa8c5..1a983aeea702fc90359d1844617f2fd28a4aa8c5
mode 000000,100644..100644
--- /dev/null
index 0000000000000000000000000000000000000000,c8411b5624c6ef52e3b67f6ff5b8e1a85d929840..c8411b5624c6ef52e3b67f6ff5b8e1a85d929840
mode 000000,100644..100644
--- /dev/null