diff options
| author | Anatol Belski <ab@php.net> | 2014-05-07 15:00:18 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-07 15:00:18 +0200 |
| commit | ede2963963ba8ef88f9ab4df7e7ba0f26413d2bc (patch) | |
| tree | 0994768125745549ea95939071eda2434e0faa66 /sapi/phpdbg/phpdbg_help.c | |
| parent | bc92917e7325cea46f2f563933957b72efc1cf61 (diff) | |
| parent | f63ca453e0b8b31fb2dd029327d5435e9650aa4d (diff) | |
| download | php-git-ede2963963ba8ef88f9ab4df7e7ba0f26413d2bc.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Fixed test (it requires ext/hash)
Fixed tests (they might fail from time to time because of session GC)
NEWS
XFAIL-- for bug #67198
remove useless indirection
fix bug #67198 (php://input regression)
rename a constant - old name to new name
test for bug #67198
Fix author name on the #63228 patch.
Conflicts:
ext/standard/php_fopen_wrapper.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions