php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,385 Commits 549 Branches 1,484 Tags
6170b2fbae0f2aaef95cce1211a9c0bb3ce00460
Commit Graph

102 Commits

Author SHA1 Message Date
Lior Kaplan ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Dmitry Stogov 53403fe56d Get rid of ZVAL_ZVAL() macro usages. Replace them with more clear and optimal equialent sequences. 2015-07-01 02:05:21 +03:00
Nikita Popov e10be0d0fd Remove unnecessary retval members in SPL 
This is what the rv params are for. Avoid holding onto values
longer than necessary.
 2015-04-15 20:39:08 +02:00
Nikita Popov 122d759618 Always throw TypeException on throwing zpp failures 
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
 2015-04-06 11:27:34 +02:00
Danack 910a324306 Fixed indentation. Fixed comment style. Fixed commented out code. 2015-03-16 23:14:56 +00:00
Danack c57bde7c9e Fixed SplFixedArray and tests. 2015-03-01 13:44:55 +00:00
Dmitry Stogov 9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Xinchen Hui fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski e888f3e4de fix datatype mismatches 2014-10-29 15:30:08 +01:00
Johannes Schlüter d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski a5ffd245bd fixed splfixedarray 2014-08-18 19:55:05 +02:00
Anatol Belski 90d6f60bc1 mostly fixes to spl, but also some other 2014-08-17 13:31:39 +02:00
Anatol Belski cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Xinchen Hui 82a4897446 Use new iterator macros 2014-05-19 10:55:09 +08: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
Stanislav Malyshev eaa39c9388 Merge branch 'PHP-5.6' 
* PHP-5.6:
  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...
 2014-05-11 18:57:39 -07:00
Stanislav Malyshev f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  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...
 2014-05-11 18:56:32 -07:00
Stanislav Malyshev af5cc61cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
 2014-05-11 18:16:19 -07:00
Stanislav Malyshev 2b475eebbe Fix bug #67247 spl_fixedarray_resize integer overflow 2014-05-11 17:54:27 -07:00
Xinchen Hui d8651fbe1c Make they are in the same style of Z_ISREF 2014-05-03 16:08:58 +08:00
Dmitry Stogov 7402af380b Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed). 
Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.
 2014-04-09 01:50:15 +04:00
Dmitry Stogov 76cc99fe60 Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
Dmitry Stogov b7938ab1bd Refactored GC (incomplete) 2014-03-19 17:00:28 +04:00
Xinchen Hui d0bbc227aa IS_UNDEF should never goes to user script land 2014-03-15 22:37:27 +08:00
Xinchen Hui bfe1f224b2 Fixed fixed_array returning initializing 2014-03-15 13:20:23 +08:00
Xinchen Hui 28e0a58018 Fixed fixedarray iterator fetching 2014-03-15 13:18:32 +08:00
Xinchen Hui b2432872c4 Fixed fixed_array fetching 2014-03-15 13:12:55 +08:00
Xinchen Hui 350260624d Fixing SplFixedArray (this probably will be revert, just show what the problem is) 2014-03-08 19:03:38 +08:00
Xinchen Hui 0680cdb4ac Fixed refcount handling 2014-02-28 22:47:24 +08:00
Xinchen Hui 0def388427 Fixed Z_ADDREF 2014-02-28 15:29:00 +08:00
Xinchen Hui a5ce7d526e Revert "Move zend_objects_store_put out of zend_object_std_init" 
This reverts commit 8ced4f0ac9.
 2014-02-28 13:59:07 +08:00
Xinchen Hui 8ced4f0ac9 Move zend_objects_store_put out of zend_object_std_init 2014-02-28 12:59:51 +08:00
Xinchen Hui 0817cee164 Fixed object creating (std_init calls store_put now) 2014-02-27 22:47:30 +08:00
Dmitry Stogov 3696e038e5 Various fixes related to read_property(), read_dimension() and iterators refactoring 2014-02-27 16:07:36 +04:00
Xinchen Hui 382b0dfdb7 Refactoring zend_iterator (incompleted) 2014-02-27 19:19:02 +08:00
Dmitry Stogov 495551aa8c Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback. 2014-02-26 15:01:08 +04:00
Xinchen Hui ad1838d248 Use better data structures (incomplete) 2014-02-16 22:27:31 +08:00
Xinchen Hui f0168baecf Use better data structures (incomplete) 2014-02-16 22:15:54 +08: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