diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-11-20 15:46:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-11-20 15:46:53 +0800 |
| commit | 0f5d03025fd22bc3f7ce4bac17432c6c17c039d3 (patch) | |
| tree | 5041327cd33c16e08bfbdc9df93a21e99f120292 /ext/ftp/php_ftp.c | |
| parent | 56f9a93939a96f93210809e99fe1d4f536b56b2d (diff) | |
| parent | ebfd93f725eb9b9cfadbbde98047efe76f658da6 (diff) | |
| download | php-git-0f5d03025fd22bc3f7ce4bac17432c6c17c039d3.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
Fix #73219 (fix acinclude when / is present)
make it possible to show specific help pages without interactive session
Conflicts:
acinclude.m4
Diffstat (limited to 'ext/ftp/php_ftp.c')
0 files changed, 0 insertions, 0 deletions