archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
php-src/ext
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
..
bcmath Bump year 2014-01-03 11:08:10 +08:00
bz2 Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
calendar Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
com_dotnet Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
ctype Bump year 2014-01-03 11:08:10 +08:00
curl Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
date Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
dba Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
dom Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
enchant Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
ereg Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
exif Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
fileinfo updated libmagic.patch for 5.6+ 2014-04-24 20:16:06 +02:00
filter Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
ftp Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
gd Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
gettext Bump year 2014-01-03 11:08:10 +08:00
gmp Add SKIPIF in GMP test 2014-03-12 14:17:08 +01:00
hash Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
iconv Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
imap Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
interbase Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
intl Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
json Merge branch 'PHP-5.6' 2014-04-13 18:56:26 -07:00
ldap Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
libxml Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
mbstring Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
mcrypt Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
mssql Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
mysql Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
mysqli Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
mysqlnd Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
oci8 Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
odbc Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
opcache Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
openssl Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pcntl Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
pcre Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo_dblib Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
pdo_firebird Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo_mysql Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo_oci Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
pdo_odbc Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo_pgsql Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pdo_sqlite Fixed Aggregate 2014-04-24 22:43:30 +08:00
pgsql Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
phar Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
posix Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
pspell Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
readline Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
recode Bump year 2014-01-03 11:08:10 +08:00
reflection Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
session Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
shmop Bump year 2014-01-03 11:08:10 +08:00
simplexml Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
skeleton
snmp Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
soap Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
sockets Bump year 2014-01-03 11:08:10 +08:00
spl Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
sqlite3 Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
standard Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
sybase_ct Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
sysvmsg Bump year 2014-01-03 11:08:10 +08:00
sysvsem Bump year 2014-01-03 11:08:10 +08:00
sysvshm Bump year 2014-01-03 11:08:10 +08:00
tidy Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
tokenizer Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
wddx Declare a number of functions as variadic. 2014-02-16 00:07:55 +01:00
xml Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
xmlreader Bump year 2014-01-03 11:08:10 +08:00
xmlrpc Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
xmlwriter Bump year 2014-01-03 11:08:10 +08:00
xsl Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zip Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
zlib Merge mainstream 'master' branch into refactoring 2014-04-26 00:32:51 +04:00
ext_skel
ext_skel_win32.php