mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-15 21:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
5984f95d8f
php-src/ext/phar
History
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
..
phar Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" 2013-08-01 08:47:13 -07:00
tests Merge branch 'PHP-5.5' into PHP-5.6 2014-04-22 16:57:47 -07:00
build_precommand.php - ws/cs, macros, code that only affects other branches 2008-08-01 13:48:45 +00:00
config.m4 Add ability of alias resolving (it cause problem while work with opcache) 2013-10-17 12:23:09 +08:00
config.w32 MFH: Fix conditional 2009-05-11 06:43:05 +00:00
CREDITS
dirstream.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
dirstream.h Bump year 2014-01-03 11:08:10 +08:00
func_interceptors.c Refactor php_addslashes using zend_string 2014-02-24 12:07:09 +08:00
func_interceptors.h Bump year 2014-01-03 11:08:10 +08:00
gdbhelp
LICENSE
Makefile.frag Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" 2013-08-01 08:47:13 -07:00
makestub.php - ws/cs, macros, code that only affects other branches 2008-08-01 13:48:45 +00:00
package.xml Remove outdated and user-specific files 2012-06-20 19:46:32 +02:00
phar_internal.h Bump year 2014-01-03 11:08:10 +08:00
phar_object.c Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
phar_path_check.c Merge branch 'PHP-5.4' into PHP-5.5 2014-04-22 16:57:17 -07:00
phar_path_check.re Fix accepting ill-formed UTF-8 characters 2014-04-22 16:55:58 -07:00
phar.1.in Bump year 2014-01-03 11:08:10 +08:00
phar.c Refactoring php_stream_copy_to_mem to return zend_string 2014-02-24 18:12:30 +08:00
phar.phar.1.in Fixed Bug #65142 Missing phar man page 2013-07-02 10:46:50 +02:00
pharzip.h Bump year 2014-01-03 11:08:10 +08:00
php_phar.h Bump year 2014-01-03 11:08:10 +08:00
shortarc.php - ws/cs, macros, code that only affects other branches 2008-08-01 13:48:45 +00:00
stream.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
stream.h Bump year 2014-01-03 11:08:10 +08:00
stub.h Bump year 2014-01-03 11:08:10 +08:00
tar.c Bump year 2014-01-03 11:08:10 +08:00
tar.h Bump year 2014-01-03 11:08:10 +08:00
TODO
util.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
zip.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00