archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
81192 commits 526 branches 1434 tags 873 MiB
Commit graph

209 commits

Author SHA1 Message Date
Dmitry Stogov
7fcd4064c0 Merge branch 'master' into phpng 
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
 2014-05-13 15:24:40 +04:00
Yasuo Ohgaki
00cacc6048 Fixed test for commit 997be125eb 2014-05-12 15:35:16 +09:00
Ferenc Kovacs
95325e5c5d XFAIL the leaking multibyte tests, we should really get to the bottom of this 2014-05-01 12:49:57 +02:00
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
Dmitry Stogov
ca05f965e3 Fixed tests (added missing zend.multibyte=On) 2014-04-10 23:07:00 +04:00
Stanislav Malyshev
cf910f351a multibytes tests still fail, put them in XFAIL 
clean up XFAIL from tests no longer failing
 2014-04-05 18:34:39 -07:00
Xinchen Hui
6965efb273 Fixed segfault due to incompleted refactoring 2014-03-24 17:14:29 +08:00
Xinchen Hui
c998bfaf86 It's a tradition return NULL on error of args parsing 2014-03-24 14:31:03 +08:00
Xinchen Hui
506f6a4282 Refactor mbstring (incompleted) 2014-03-24 12:40:07 +08:00
Yasuo Ohgaki
ca927bb47e Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding 2014-03-12 17:54:22 +09:00
Yasuo Ohgaki
cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Stanislav Malyshev
8071de3dfd tests still failing, so xfail for now until fixed 2014-01-29 23:48:33 -08:00
Yasuo Ohgaki
d941ac5b4f Fixed zend.multibyte tests partially 2014-01-29 15:41:30 +09:00
Stanislav Malyshev
f49965b487 XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:51:17 -08:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Rui Hirokawa
0a974f14d1 MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:46:54 +09:00
Xinchen Hui
699dc04c55 Missed SKIPIF 2013-05-09 15:57:25 +08:00
Xinchen Hui
375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08:00
Moriyoshi Koizumi
0ea83ff847 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:04:23 +09:00
Xinchen Hui
e222837f6e Merge branch 'PHP-5.3' into PHP-5.4 2012-11-07 17:08:34 +08:00
Xinchen Hui
7fcbe4d546 Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On) 2012-11-07 17:05:24 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Lars Strojny
133f610bb1 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 14:52:05 +02:00
Anatoliy Belsky
1a0c9ecaee Fixed bug #61631 mbstring mail related tests fail 2012-04-10 12:23:07 +02:00
Anatoliy Belsky
2ca49d39a3 Fixed bug #61631 mbstring mail related tests fail 2012-04-10 11:47:18 +02:00
Xinchen Hui
df129ae7ea Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, and merge the modification from trunk
 2012-03-22 17:31:15 +08:00
Xinchen Hui
523396cb28 Fix test, and merge the modification from trunk 2012-03-22 17:30:16 +08:00
Rui Hirokawa
5d64c94f35 MFH mb_ereg_replace_callback() for security enhancements. 2012-03-02 14:19:05 +00:00
Rasmus Lerdorf
f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Lars Strojny
33a2c339bd Test for null behavior with ext/mbstring functions 2012-02-01 14:43:52 +00:00
Rui Hirokawa
7ba37f7921 fixed failed tests (backport from PHP_5_4/trunk). 2012-01-14 09:07:10 +00:00
Felipe Pena
f7048d0925 - Fixed possible crash in mb_ereg_search_init() using empty pattern 2011-11-21 19:15:18 +00:00
Felipe Pena
97659d4842 - Fixed possible crash in mb_ereg_search_init() using empty pattern 2011-11-21 19:15:18 +00:00
Xinchen Hui
5008390304 Fixed bug #60306 (Characters lost while converting from cp936 to utf8) 2011-11-18 08:50:29 +00:00
Xinchen Hui
0ac9b9b0ae Fix tests 2011-11-08 06:35:07 +00:00
Rui Hirokawa
3d888412da MFH: fixed #40685: removed '&' in mb_decode_numericentity(). 2011-09-24 02:20:38 +00:00
Rui Hirokawa
a6a3bd010a MFH: fixed #40685: removed '&' in mb_decode_numericentity(). 2011-09-24 02:12:17 +00:00
Rui Hirokawa
d938844d8f MFH: fixed a bug in convertion table and added test script for emoji. 2011-09-23 11:11:38 +00:00
Rui Hirokawa
6675883d81 MFH: fixed test failure on win32. 2011-09-11 13:15:48 +00:00
Rui Hirokawa
2d6ff8dc5c MFH: fixed test failure on win32. 2011-09-11 13:04:38 +00:00
Rui Hirokawa
5894909f01 MFH: fixed test case failures. 2011-09-11 12:29:15 +00:00
Rui Hirokawa
59b9ca51b0 MFH: fixed test case failures. 2011-09-11 12:12:48 +00:00
Rui Hirokawa
b870f23396 revert previous commit. 2011-09-11 03:56:16 +00:00
Rui Hirokawa
1dd6fd0d4f revert previous commit. 2011-09-11 03:55:08 +00:00
Rui Hirokawa
9d86be5068 MFH: removed test script which depends on the removed register_globals. 2011-09-11 02:16:58 +00:00
Pierre Joye
8ab88f2e72 - add skipif 2011-09-06 06:44:59 +00:00
Pierre Joye
6be168b22d - add skipif 2011-09-06 06:44:59 +00:00
Stanislav Malyshev
8d4848f3d3 fix test 2011-09-04 05:00:30 +00:00