Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors) | Xinchen Hui | 2015-11-27 | 1 | -0/+62 |
| | |||||
* | Fixed test. | Dmitry Stogov | 2015-10-07 | 1 | -1/+4 |
| | | | | | MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes. Probably we need to add yet another condition to also check MariaDB version. | ||||
* | fix test | Anatol Belski | 2015-09-30 | 1 | -0/+4 |
| | |||||
* | Merge branch 'PHP-5.6' into PHP-7.0 | Andrey Hristov | 2015-09-30 | 1 | -1/+3 |
|\ | |||||
| * | Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't ↵ | Andrey Hristov | 2015-09-30 | 1 | -1/+3 |
| | | | | | | | | export it (for now). | ||||
| * | Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server | Andrey Hristov | 2015-09-23 | 2 | -1/+65 |
| | | |||||
* | | Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more ↵ | Dmitry Stogov | 2015-09-24 | 1 | -9/+9 |
| | | | | | | | | appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). | ||||
* | | Fix for Bug #70384 mysqli_real_query(): Unknown type 245 sent by the server | Andrey Hristov | 2015-09-23 | 2 | -1/+65 |
| | | |||||
* | | Avoid reallocations | Dmitry Stogov | 2015-09-14 | 1 | -3/+1 |
| | | |||||
* | | Fix #32490: constructor of mysqli has wrong name | Christoph M. Becker | 2015-09-01 | 6 | -72/+83 |
| | | | | | | | | | | As of PHP 7 old style constructor names are deprecated, so we rename mysqli::mysqli() to mysqli::__construct(). | ||||
* | | Remove superfluous forward declaration | Christoph M. Becker | 2015-08-25 | 1 | -1/+0 |
| | | | | | | | | | | mysqli_get_cache_stats() has been removed with commit f9ad56e; we're finally getting rid of its remaining forward declaration. | ||||
* | | Merge branch 'zval_dump_consistent' of https://github.com/laruence/php-src | Xinchen Hui | 2015-07-30 | 2 | -9/+9 |
|\ \ | |||||
| * | | Make debug_val_dump and var_dump prints int and float the same | Xinchen Hui | 2015-07-23 | 2 | -9/+9 |
| | | | |||||
* | | | switch to the unified globals accessor where appropriate | Anatol Belski | 2015-07-29 | 1 | -6/+2 |
| | | | |||||
* | | | Fix failing tests from exception code changes | Aaron Piotrowski | 2015-07-07 | 2 | -4/+4 |
|/ / | |||||
* | | Switch position of ce in exception ce variable names | Aaron Piotrowski | 2015-07-03 | 1 | -4/+4 |
| | | |||||
* | | Change zend_exception_get_default() to zend_exception_ce | Aaron Piotrowski | 2015-07-03 | 1 | -4/+4 |
| | | |||||
* | | Fixed broken name | Dmitry Stogov | 2015-07-01 | 1 | -4/+4 |
| | | |||||
* | | Cleanup (updated comments) | Dmitry Stogov | 2015-07-01 | 1 | -1/+1 |
| | | |||||
* | | Cleanup (replce hack by a clean implementation) | Dmitry Stogov | 2015-07-01 | 5 | -14/+16 |
| | | |||||
* | | Cleanup (removed dead code) | Dmitry Stogov | 2015-07-01 | 1 | -5/+0 |
| | | |||||
* | | Cleanup (avoid duplication) | Dmitry Stogov | 2015-07-01 | 1 | -4/+2 |
| | | |||||
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 1 | -5/+5 |
| | | | | | | | | semantick changes). | ||||
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵ | Dmitry Stogov | 2015-06-30 | 5 | -20/+20 |
| | | | | | | | | semantick changes). | ||||
* | | Fix more proto comments | Rasmus Lerdorf | 2015-06-23 | 1 | -7/+7 |
| | | |||||
* | | Remove these old references to the DSP files we don't use anymore | Kalle Sommer Nielsen | 2015-06-22 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-06-14 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt | ||||
| * | | Make convert_to_* safe with rc>1 | Nikita Popov | 2015-06-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Update exception names in tests after formatting changes. | Aaron Piotrowski | 2015-05-17 | 7 | -7/+7 |
| | | | |||||
* | | | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-05-17 | 7 | -7/+7 |
|\ \ \ | |/ / | |||||
| * | | Tweak uncaught exception message display | Nikita Popov | 2015-05-17 | 7 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions. | ||||
* | | | Updated tests to reflect exception class changes. | Aaron Piotrowski | 2015-05-16 | 9 | -11/+11 |
|/ / | |||||
* | | Display EngineExceptions like ordinary exceptions | Nikita Popov | 2015-05-15 | 7 | -7/+29 |
| | | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup. | ||||
* | | Drop now unnecessary start parameter | Nikita Popov | 2015-04-04 | 1 | -11/+10 |
| | | |||||
* | | Fix parameter parsing for mysqli_stmt_bind_result() | Nikita Popov | 2015-04-04 | 2 | -26/+9 |
| | | | | | | | | Also drops one unnecessary arg allocation | ||||
* | | Merge branch 'PHP-5.6' | Ferenc Kovacs | 2015-04-01 | 1 | -2/+0 |
|\ \ | |/ | | | | | | | * PHP-5.6: test fixes | ||||
| * | Merge branch 'PHP-5.5' into PHP-5.6 | Ferenc Kovacs | 2015-04-01 | 1 | -2/+0 |
| |\ | | | | | | | | | | | | | * PHP-5.5: test fixes | ||||
| | * | test fixes | Ferenc Kovacs | 2015-04-01 | 1 | -2/+0 |
| | | | |||||
* | | | Finish PHP 4 constructor deprecation | Nikita Popov | 2015-03-31 | 1 | -1/+1 |
| | | | |||||
* | | | Deprecate PHP 4 constructors | Andrea Faulds | 2015-03-31 | 2 | -6/+6 |
| | | | |||||
* | | | cleanup the mod version macros, round 2 | Anatol Belski | 2015-03-23 | 2 | -5/+4 |
| | | | |||||
* | | | Optimize zend_string_realloc() add more specialized versions ↵ | Dmitry Stogov | 2015-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | | zend_string_extend() and zend_string_truncate() | ||||
* | | | String reference counters may be increased when string copied | Dmitry Stogov | 2015-03-19 | 1 | -8/+8 |
| | | | |||||
* | | | Revert previously commit by accident | Xinchen Hui | 2015-03-13 | 1 | -2/+2 |
| | | | |||||
* | | | Use specialized macro for string zval creation | Dmitry Stogov | 2015-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://git.php.net/repository/php-src | Xinchen Hui | 2015-03-10 | 4 | -8/+8 |
|\ \ \ | |||||
| * | | | Errors converted to exceptions are not "recoverable" anymore. | Dmitry Stogov | 2015-03-10 | 4 | -8/+8 |
| | | | | |||||
* | | | | Merge branch 'PHP-5.6' | Xinchen Hui | 2015-03-10 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||||
| * | | Update NEWS | Xinchen Hui | 2015-03-10 | 1 | -2/+2 |
| | | | |||||
* | | | Implement engine exceptions | Dmitry Stogov | 2015-03-09 | 2 | -18/+25 |
| | | | | | | | | | | | | | | | | | | | | | RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface. |