clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
87,911 Commits 494 Branches 1,367 Tags 801 MiB
ce9f52adcd
Commit Graph

1063 Commits

Author SHA1 Message Date
Anatol Belski
6428b49851 ported ext/mbstring 2014-08-19 19:42:16 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Lior Kaplan
741605da73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Correct typo in comments: 'initialized'

Conflicts:
	ext/dom/php_dom.c
	ext/spl/php_spl.c
 2014-08-17 21:37:22 +03:00
Lior Kaplan
f1d0e50ea8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Correct typo in comments: 'initialized'
 2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Correct typo in comments: 'initialized'
 2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630 Correct typo in comments: 'initialized' 2014-08-17 21:32:53 +03:00
Veres Lajos
1e3452992f typofixes 2014-08-17 16:00:39 +03:00
Dmitry Stogov
6c8db864e0 Implemented builtin instruction for strlen() 2014-07-11 18:52:27 +04:00
Dmitry Stogov
6bf24f4dd0 Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data) 2014-07-04 18:03:45 +04:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Sobak
00c362c1f6 Removed another cvsclean file 2014-06-08 19:28:06 -07:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov
4affab237d Use new zend_hash API 2014-05-28 17:43:11 +04:00
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
Yasuo Ohgaki
997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Xinchen Hui
d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08: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
Ferenc Kovacs
35d213c9ce put this test back to XFAIL, as it was before, since it is still leaking memory 2014-04-29 15:58:00 +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
7584ae3200 Fixed compilaation warnings 2014-04-22 18:52:59 +04:00
Dmitry Stogov
f9b26bc39a Cleanup (2-nd round) 2014-04-15 21:56:30 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
0d341e5b0e No need anymore 2014-04-11 16:30:19 +08:00
Xinchen Hui
2e97e18bd0 Fixed _php_mbstr_parse_mail_headers 2014-04-11 12:53:35 +08:00
Dmitry Stogov
ca05f965e3 Fixed tests (added missing zend.multibyte=On) 2014-04-10 23:07:00 +04:00
Dmitry Stogov
39d2cede74 Fixed support for IS_INDIRECT and IS_REFERENCE 2014-04-09 13:23:28 +04:00
Dmitry Stogov
ad524d2818 Use proper size 2014-04-09 12:16:21 +04:00
Dmitry Stogov
48d3b95aee Fixed NULL pointer dereferencing 2014-04-09 11:56:48 +04:00
Dmitry Stogov
98ab24f1af Fixed NULL pointer dereferencing 2014-04-09 11:39:39 +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
Yasuo Ohgaki
a84e5dc37d Remove unneeded string copy. 
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
 2014-03-27 17:20:57 +09: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
50dc2ec46c Fixed memleak temporary 2014-03-24 13:57:59 +08:00
Xinchen Hui
807ed2eb19 Fixed encoding list building while array arg 2014-03-24 13:56:46 +08:00
Xinchen Hui
506f6a4282 Refactor mbstring (incompleted) 2014-03-24 12:40:07 +08:00
Xinchen Hui
9011a70c7f Refactor mbstring (incompleted) 2014-03-23 23:38:32 +08:00
Xinchen Hui
946269e48e Refactor mbstring (incompleted) 2014-03-23 20:04:58 +08:00
Yasuo Ohgaki
3ce980cf97 Merge branch 'pull-request/622' into PHP-5.6 
* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
 2014-03-19 17:29:24 +09:00
Anatol Belski
f5ebea91b0 updated to oniguruma to 5.9.5 2014-03-15 17:56:04 +01: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
Veres Lajos
a7ec000f35 a few typofixes 2014-02-14 17:16:17 +02: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
Stanislav Malyshev
c24f11450f tests still failing, so xfail for now until fixed 2014-01-29 23:48:19 -08:00
Stanislav Malyshev
770aeeb40c tests still failing, so xfail for now until fixed 2014-01-29 23:48:07 -08:00
Yasuo Ohgaki
a6ac64bdbb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed zend.multibyte tests partially
 2014-01-29 15:53:57 +09:00
Yasuo Ohgaki
3182660c04 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed zend.multibyte tests partially
 2014-01-29 15:51:47 +09: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
Stanislav Malyshev
de62be2682 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:19 -08:00
Stanislav Malyshev
dfe6628440 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  XFAIL multibyte tests until they are fixed (bug 66582)
 2014-01-26 15:12:00 -08:00
Stanislav Malyshev
cd0bf6fc3a XFAIL multibyte tests until they are fixed (bug 66582) 2014-01-26 15:11:15 -08:00
Yasuo Ohgaki
fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
 2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Felipe Pena
b7c64683da Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
 2013-10-20 08:51:27 -02:00
Felipe Pena
df31eb8fdc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
 2013-10-20 08:51:17 -02:00
Felipe Pena
33d377e701 - Fixed possible uninitialized scalar variable usage (spotted by Coverity) 2013-10-20 08:51:09 -02:00
Nikita Popov
0d7a638866 Implement variadic function syntax 
As per RFC: https://wiki.php.net/rfc/variadics
 2013-09-26 18:39:17 +02:00
Michael Wallner
2438490add slim post data 2013-08-27 13:31:35 +02:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07: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
Rui Hirokawa
7da3315015 added test script for bug65045. 2013-07-31 08:18:39 +09:00
Rui Hirokawa
c10d7e1afc MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:17:15 +09:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Xinchen Hui
b3f6cc20e0 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55 Missed SKIPIF 2013-05-09 15:57:25 +08:00
Anatol Belski
4091e94660 Fixed bug #64769 mbstring PHPTs crash on Windows x64 
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
 2013-05-08 19:22:37 +02:00
Xinchen Hui
69b80a93de Merge branch 'PHP-5.4' into PHP-5.5 2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08:00
Moriyoshi Koizumi
20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09: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
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
b936a815fb Merge branch 'PHP-5.4' 2012-11-07 17:09:27 +08: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
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Lars Strojny
352a1956b6 Allow null as a default value for length in mb_substr() and mb_strcut() 2012-09-02 15:02:26 +02: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
58aa160ee4 Fixed bug #61631 mbstring mail related tests fail 2012-04-10 12:19:39 +02:00
Anatoliy Belsky
2ca49d39a3 Fixed bug #61631 mbstring mail related tests fail 2012-04-10 11:47:18 +02:00
Xinchen Hui
191df5bd06 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix test, and merge the modification from trunk

Conflicts:
	ext/mbstring/tests/mb_eregi_replace.phpt
 2012-03-22 17:33:23 +08: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