diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-02 09:42:03 +0000 |
| commit | f8b291d2885c7b9a92d6a1af9f630ad619e4c875 (patch) | |
| tree | f12fa8ebef15c2aeb9048df2bb55300df6a0a948 /ext/json/php_json_parser.h | |
| parent | 8c5647eef1f456e969cb815bbb1b3e51535804e8 (diff) | |
| parent | f3f594a47d63e993595ad344614cee4a910305b1 (diff) | |
| download | php-git-f8b291d2885c7b9a92d6a1af9f630ad619e4c875.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Switch reflection to use smart_str
Add smart_str_append_printf
Make printf_to_smart_str(ing) the primitive printf operation
Export zend_s(tr)pprintf
Sync smart_string implementation with smart_str
Move smart_string to Zend
Fixed bug #73154
Flush stderr on win32 in cli_log_message
Fixed bug #73154
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions