Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| | | |||||
| * | Refactored the fix for bug #66084, by cmb@php.net | Anatol Belski | 2015-05-29 | 1 | -1/+1 |
| | | |||||
| * | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | |||||
* | | add range checks to simplexml | Anatol Belski | 2015-08-26 | 1 | -3/+34 |
| | | |||||
* | | Fix simplexml warnings | Nikita Popov | 2015-07-17 | 1 | -4/+4 |
| | | |||||
* | | Switch position of ce in exception ce variable names | Aaron Piotrowski | 2015-07-03 | 1 | -1/+1 |
| | | |||||
* | | Change zend_exception_get_default() to zend_exception_ce | Aaron Piotrowski | 2015-07-03 | 1 | -1/+1 |
| | | |||||
* | | Cleanup (removed dead code) | Dmitry Stogov | 2015-07-01 | 1 | -5/+0 |
| | | |||||
* | | Improved zend_string API (Francois Laupretre) | Dmitry Stogov | 2015-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods | ||||
* | | Fix more proto comments | Rasmus Lerdorf | 2015-06-23 | 1 | -1/+1 |
| | | |||||
* | | Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few ↵ | Dmitry Stogov | 2015-06-12 | 1 | -9/+5 |
| | | | | | | | | | | | | places). Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places) | ||||
* | | Make convert_to_* safe with rc>1 | Nikita Popov | 2015-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This only involves switching zval_dtor to zval_ptr_dtor for arrays and making the convert_to_object for arrays a bit more generic. All the other changes outside zend_operators.c just make use of this new ability (use COPY instead of DUP). What's still missing: Proper references handling. I've seen many convert_to* calls that will break when a reference is used. Also fixes bug #69788. | ||||
* | | fixed whitespace dependend behavior of casting SimpleXMLElements to boolean | Christoph M. Becker | 2015-05-29 | 1 | -1/+1 |
| | | |||||
* | | fixed whitespace depending (mis)behavior of var_dump'ing and print_r'ing ↵ | Christoph M. Becker | 2015-05-29 | 1 | -1/+1 |
| | | | | | | | | SimpleXMLElements | ||||
* | | Merge branch 'master' of git.php.net:php-src | Xinchen Hui | 2015-05-06 | 1 | -40/+70 |
|\ \ | |||||
| * | | Loop splitting and specialization | Dmitry Stogov | 2015-05-05 | 1 | -12/+35 |
| | | | |||||
| * | | Fixed compilation warning | Dmitry Stogov | 2015-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | Use zend heap instead of system | Dmitry Stogov | 2015-05-05 | 1 | -12/+12 |
| | | | |||||
| * | | Use better zend_hash_*() functions. | Dmitry Stogov | 2015-05-05 | 1 | -13/+16 |
| | | | |||||
| * | | Removed check for count() in SXE class | Dmitry Stogov | 2015-05-05 | 1 | -3/+7 |
| | | | |||||
* | | | fixed comment | Xinchen Hui | 2015-05-05 | 1 | -1/+1 |
|/ / | |||||
* | | Unused macros | Xinchen Hui | 2015-05-05 | 1 | -11/+0 |
| | | |||||
* | | Optimize cast simplexml to IS_BOOL | Xinchen Hui | 2015-05-05 | 1 | -5/+96 |
| | | |||||
* | | Unused var | Xinchen Hui | 2015-05-05 | 1 | -4/+2 |
| | | |||||
* | | Avoid repeatable lookups for count() method in the same class entry. | Dmitry Stogov | 2015-05-05 | 1 | -27/+47 |
| | | |||||
* | | Always throw TypeException on throwing zpp failures | Nikita Popov | 2015-04-06 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | cleanup mod version macros and mod defs, round x | Anatol Belski | 2015-03-23 | 1 | -1/+1 |
| | | |||||
* | | Move zend_object->guards into additional slot of ↵ | Dmitry Stogov | 2015-02-04 | 1 | -1/+1 |
| | | | | | | | | zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. | ||||
* | | fix warnings | Michael Wallner | 2015-01-30 | 1 | -4/+4 |
| | | |||||
* | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | |||||
* | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 1 | -8/+8 |
| | | |||||
* | | Improved trim/ltrim/rtrim functions. | Dmitry Stogov | 2014-12-23 | 1 | -4/+5 |
| | | | | | | | | Now php_trim() operates on zend_string and returns zend_string (it may return the same zend_string). | ||||
* | | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -219/+219 |
| | | |||||
* | | Fixed zval copying | Xinchen Hui | 2014-10-22 | 1 | -12/+4 |
| | | |||||
* | | Remove get_class_entry object handler | Nikita Popov | 2014-10-09 | 1 | -2/+0 |
| | | |||||
* | | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 1 | -1/+1 |
| | | |||||
* | | 's' works with size_t round 2 | Anatol Belski | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | first show to make 's' work with size_t | Anatol Belski | 2014-08-27 | 1 | -11/+11 |
| | | |||||
* | | master renames phase 7PRE_AST_MERGE | Anatol Belski | 2014-08-25 | 1 | -2/+2 |
| | | |||||
* | | master renames phase 1 | Anatol Belski | 2014-08-25 | 1 | -60/+60 |
| | | |||||
* | | ported ext/simplexml | Anatol Belski | 2014-08-19 | 1 | -19/+19 |
| | | |||||
* | | basic macro replacements, all at once | Anatol Belski | 2014-08-19 | 1 | -48/+48 |
| | | |||||
* | | Refactored run_time_cache usage in object handlers | Dmitry Stogov | 2014-07-07 | 1 | -5/+5 |
| | | |||||
* | | Avoid in-place modification | Dmitry Stogov | 2014-05-30 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into phpng | Dmitry Stogov | 2014-05-13 | 1 | -3/+9 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (41 commits) fix test - output can be chunked fix test fix test Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6 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 | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2014-05-10 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | * PHP-5.4: - Move checking | ||||
| | * | - Move checking | Felipe Pena | 2014-05-10 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'PHP-5.4' into PHP-5.5 | Felipe Pena | 2014-05-10 | 1 | -0/+3 |
| |\ \ | | |/ | | | | | | | | | | * PHP-5.4: - Fixed missing NULL check in SimpleXMLElement::xpath() | ||||
| | * | - Fixed missing NULL check in SimpleXMLElement::xpath() | Felipe Pena | 2014-05-10 | 1 | -0/+3 |
| | | |