]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorLior Kaplan <kaplanlior@gmail.com>
Fri, 1 Jan 2016 18:04:31 +0000 (20:04 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Fri, 1 Jan 2016 18:04:31 +0000 (20:04 +0200)
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)

80 files changed:
1  2 
ext/curl/interface.c
ext/dba/php_dba.h
ext/exif/exif.c
ext/hash/hash.c
ext/hash/php_hash.h
ext/mysqli/mysqli_api.c
ext/mysqli/mysqli_prop.c
ext/mysqlnd/mysqlnd.h
ext/mysqlnd/mysqlnd_alloc.c
ext/mysqlnd/mysqlnd_alloc.h
ext/mysqlnd/mysqlnd_auth.c
ext/mysqlnd/mysqlnd_block_alloc.c
ext/mysqlnd/mysqlnd_block_alloc.h
ext/mysqlnd/mysqlnd_charset.c
ext/mysqlnd/mysqlnd_charset.h
ext/mysqlnd/mysqlnd_connection.c
ext/mysqlnd/mysqlnd_debug.c
ext/mysqlnd/mysqlnd_debug.h
ext/mysqlnd/mysqlnd_driver.c
ext/mysqlnd/mysqlnd_enum_n_def.h
ext/mysqlnd/mysqlnd_ext_plugin.c
ext/mysqlnd/mysqlnd_ext_plugin.h
ext/mysqlnd/mysqlnd_libmysql_compat.h
ext/mysqlnd/mysqlnd_loaddata.c
ext/mysqlnd/mysqlnd_priv.h
ext/mysqlnd/mysqlnd_protocol_frame_codec.h
ext/mysqlnd/mysqlnd_ps.c
ext/mysqlnd/mysqlnd_ps_codec.c
ext/mysqlnd/mysqlnd_result.c
ext/mysqlnd/mysqlnd_result.h
ext/mysqlnd/mysqlnd_result_meta.c
ext/mysqlnd/mysqlnd_statistics.c
ext/mysqlnd/mysqlnd_statistics.h
ext/mysqlnd/mysqlnd_structs.h
ext/mysqlnd/mysqlnd_wireprotocol.c
ext/mysqlnd/mysqlnd_wireprotocol.h
ext/mysqlnd/php_mysqlnd.c
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/compact_literals.c
ext/opcache/Optimizer/nop_removal.c
ext/opcache/Optimizer/optimize_func_calls.c
ext/opcache/Optimizer/optimize_temp_vars_5.c
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/pass2.c
ext/opcache/Optimizer/pass3.c
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.h
ext/opcache/Optimizer/zend_optimizer_internal.h
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.h
ext/opcache/zend_accelerator_module.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_file_cache.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/openssl/openssl.c
ext/pdo_mysql/php_pdo_mysql_int.h
ext/pdo_odbc/php_pdo_odbc.h
ext/pdo_sqlite/php_pdo_sqlite.h
ext/pgsql/pgsql.c
ext/pgsql/php_pgsql.h
ext/phar/phar_object.c
ext/readline/readline.c
ext/reflection/php_reflection.c
ext/shmop/php_shmop.h
ext/spl/spl_directory.c
ext/standard/basic_functions.c
ext/standard/ftok.c
ext/standard/string.c
ext/standard/url.c
ext/sysvshm/php_sysvshm.h
ext/xml/xml.c
ext/xsl/php_xsl.h
ext/zip/php_zip.c
main/php_ini.c
main/php_streams.h
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_opcode.c

Simple merge
Simple merge
diff --cc ext/exif/exif.c
Simple merge
diff --cc ext/hash/hash.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/xml/xml.c
Simple merge
Simple merge
Simple merge
diff --cc main/php_ini.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge