1
0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00

Merge branch 'PHP-5.5'

* PHP-5.5:
  Removed files that are neccessary only for standalone pecl branch
  setting plausible default value for struct members
This commit is contained in:
Dmitry Stogov
2013-03-17 10:42:41 +04:00
4 changed files with 0 additions and 303 deletions

View File

@@ -1,87 +0,0 @@
# 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

View File

@@ -1,14 +0,0 @@
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+"

View File

@@ -1,68 +0,0 @@
--------------------------------------------------------------------
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>.

View File

@@ -1,134 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<package
packagerversion="1.9.4" version="2.0"
xmlns="http://pear.php.net/dtd/package-2.0"
xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>zendoptimizerplus</name>
<channel>pecl.php.net</channel>
<summary>The Zend Optimizer+ provides faster PHP execution through opcode caching and optimization.</summary>
<description>
The Zend Optimizer+ provides faster PHP execution through opcode caching and
optimization. It improves PHP performance by storing precompiled script
bytecode in the shared memory. This eliminates the stages of reading code from
the disk and compiling it on future access. In addition, it applies a few
bytecode optimization patterns that make code execution faster.
</description>
<lead>
<name>Dmitry Stogov</name>
<user>dmitry</user>
<email>dmitry@zend.com</email>
<active>yes</active>
</lead>
<lead>
<name>Zeev Suraski</name>
<user>zeev</user>
<email>zeev@zend.com</email>
<active>yes</active>
</lead>
<lead>
<name>Hannes Magnusson</name>
<user>bjori</user>
<email>bjori@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Xinchen Hui</name>
<user>laruence</user>
<email>laruence@php.net</email>
<active>yes</active>
</lead>
<date>2013-03-04</date>
<time>19:40:00</time>
<version>
<release>7.0.0</release>
<api>7.0.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Initial release
</notes>
<contents>
<dir name="/">
<file role="doc" name="README"/>
<file role="doc" name="LICENSE"/>
<file role="src" name="config.w32"/>
<file role="src" name="config.m4"/>
<file role="src" name="zend_accelerator_util_funcs.c"/>
<file role="src" name="zend_persist_calc.c"/>
<file role="src" name="ZendAccelerator.c"/>
<file role="src" name="shared_alloc_mmap.c"/>
<file role="src" name="zend_accelerator_debug.c"/>
<file role="src" name="zend_accelerator_blacklist.c"/>
<file role="src" name="shared_alloc_shm.c"/>
<file role="src" name="zend_accelerator_util_funcs.h"/>
<file role="src" name="zend_accelerator_module.h"/>
<file role="src" name="zend_shared_alloc.h"/>
<file role="src" name="zend_persist.h"/>
<file role="src" name="shared_alloc_win32.c"/>
<file role="src" name="zend_shared_alloc.c"/>
<file role="src" name="ZendAccelerator.h"/>
<file role="src" name="zend_persist.c"/>
<file role="src" name="shared_alloc_posix.c"/>
<file role="src" name="zend_accelerator_module.c"/>
<file role="src" name="zend_accelerator_blacklist.h"/>
<file role="src" name="zend_accelerator_hash.c"/>
<file role="src" name="zend_accelerator_debug.h"/>
<file role="src" name="zend_accelerator_hash.h"/>
<dir name="Optimizer">
<file role="src" name="pass3.c"/>
<file role="src" name="zend_optimizer.h"/>
<file role="src" name="nop_removal.c"/>
<file role="src" name="pass10.c"/>
<file role="src" name="optimize_temp_vars_5.c"/>
<file role="src" name="zend_optimizer_internal.h"/>
<file role="src" name="pass2.c"/>
<file role="src" name="zend_optimizer.c"/>
<file role="src" name="pass9.c"/>
<file role="src" name="pass1_5.c"/>
<file role="src" name="block_pass.c"/>
<file role="src" name="pass5.c"/>
</dir> <!-- Optimizer -->
<dir name="tests">
<file role="src" name="001_cli.phpt"/>
<file role="src" name="skipif.inc"/>
<file role="src" name="bug64353.phpt"/>
<file role="src" name="issue0057.phpt"/>
</dir> <!-- tests -->
</dir> <!-- / -->
</contents>
<dependencies>
<required>
<php>
<min>5.2.0</min>
</php>
<pearinstaller>
<min>1.4.0b1</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>zendoptimizerplus</providesextension>
<zendextsrcrelease />
<changelog>
<release>
<version>
<release>7.0.0</release>
<api>7.0.0</api>
</version>
<stability>
<release>beta</release>
<api>beta</api>
</stability>
<date>2013-03-04</date>
<license uri="http://www.php.net/license">PHP License</license>
<notes>
- Initial release.
</notes>
</release>
</changelog>
</package>