archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
137871 commits 526 branches 1434 tags 865 MiB
Commit graph

361 commits

Author SHA1 Message Date
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
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Bob Weinand
9663193bbc Merge branch 'PHP-5.6' 2014-04-11 10:11:58 +02:00
Bob Weinand
f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08: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
Kalle Sommer Nielsen
d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true() 
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
 2013-12-18 07:25:05 +01:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01: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
Dmitry Stogov
2659f5e88e Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice) 2012-09-03 11:52:42 +04:00
Dmitry Stogov
33db8c0ef6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
 2012-09-03 11:51:17 +04:00
Dmitry Stogov
485c09a376 Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice). 2012-09-03 11:49:58 +04:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
e43ff1359e Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Dmitry Stogov
6ddfa33aad Fixed bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself) 2011-08-10 13:44:48 +00:00
Dmitry Stogov
dc5b3231dc Fixed bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself) 2011-08-10 13:44:48 +00:00
Dmitry Stogov
5cb244aad2 Fixed bug #55323 (SoapClient segmentation fault when XSD_TYPEKIND_EXTENSION contains itself) 2011-08-10 13:44:48 +00:00
Dmitry Stogov
0bce4957e5 Fixed crash when passing invalid timestamp (negative integer on win32) 2011-05-04 07:53:22 +00:00
Dmitry Stogov
fbe8cf9a40 Fixed crash when passing invalid timestamp (negative integer on win32) 2011-05-04 07:53:22 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
5a7bd45c1a - cleanup ze1/ze2 2010-09-16 10:01:51 +00:00
Rasmus Lerdorf
8022e383ff This incorrect contraction started to get on my eyes after I saw it for the 
87th time while struggling with an annoying SOAP service.
 2010-09-03 22:24:08 +00:00
Rasmus Lerdorf
8790a4918c This incorrect contraction started to get on my eyes after I saw it for the 
87th time while struggling with an annoying SOAP service.
 2010-09-03 22:24:08 +00:00
Dmitry Stogov
d868733cc3 Fixed bug #52041 (Memory leak when writing on uninitialized variable returned from function) 2010-06-15 08:22:51 +00:00
Dmitry Stogov
3d5f729181 Fixed bug #52041 (Memory leak when writing on uninitialized variable returned from function) 2010-06-15 08:22:51 +00:00
Dmitry Stogov
94dd83722b Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table 2010-04-20 10:57:45 +00:00
Michael Maclean
ca9190648d Remove some more calls to TSRMLS_FETCH() 2010-03-25 20:06:05 +00:00
Michael Maclean
c261f45e4b Remove some calls to TSRMLS_FETCH in ext/soap 2010-03-25 14:43:15 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
f1d5433959 - Fixed bug #50258 (typos in error strings) 2009-11-21 19:43:00 +00:00
Felipe Pena
aa8811982e - MFH: Fixed bug #48557 (Numeric string keys in Apache Hashmaps are not cast to integers) patch by David Zülke <david.zuelke at bitextender.com> 2009-06-15 17:31:02 +00:00
Dmitry Stogov
f946918fc6 Fixed bug #46419 (Elements of associative arrays with NULL value are lost) 2009-01-26 11:09:36 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Dmitry Stogov
725640d82b Fixed bug #44882 (SOAP extension object decoding bug) 2008-11-27 14:49:56 +00:00
Felipe Pena
5153c19714 - MFH: Fixed bug #46389 (NetWare needs small patch for _timezone) (patch by guenter at php.net) 2008-10-26 02:00:44 +00:00
Dmitry Stogov
ec7cca7f2d ws 2008-10-16 15:49:29 +00:00
Dmitry Stogov
001a548b1a Fixed bug #43723 (SOAP not sent properly from client for <choice>) 2008-10-16 15:36:59 +00:00
Dmitry Stogov
71aad5da4a Fixed bug #43045 (SOAP encoding violation on "INF" for type double/float) 2008-10-01 08:42:48 +00:00
Dmitry Stogov
18226f79bc Remplemented support for SplArray using Traversable interface. 2008-01-09 13:49:40 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Dmitry Stogov
964b8bb30d Added ability to use SplArrays instead of plain arrays in ext/soap. (Joshua Reese, Dmitry) 2007-12-27 13:10:20 +00:00
Dmitry Stogov
68bacdd797 Fixed possible crash because of uninitialized value (Zdash Urf) 2007-10-17 12:09:03 +00:00