diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-09-01 22:43:17 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-09-01 22:43:17 +0800 |
| commit | 5d5a7b1f7f66fd4224088df5d03a7a585e19e4dc (patch) | |
| tree | 07ab3b78b73e8f74ae100f7d576b9b24531a7347 /ext/mysqlnd/php_mysqlnd.c | |
| parent | bc7833ddd2fd217bf4d3cecf5ce2db0a788ead61 (diff) | |
| parent | f0ba3e265abe57151f3a7e6122c9ff74080ad25b (diff) | |
| download | php-git-5d5a7b1f7f66fd4224088df5d03a7a585e19e4dc.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated UPGRADING for #38409
Updated NEWS for #38409
Added test case
Making ini parser typed - Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file() - Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE - Added zend_ini_copy_typed_value() function for zval initialisation - Updated RETURN_TOKEN() to observe scanner_mode
Conflicts:
Zend/zend_ini_parser.y
Zend/zend_ini_scanner.c
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions