Merge branch 'pull-request/2117'

* pull-request/2117:
  Allow to configure php-fpm slow log trace callers limit

diff --cc sapi/fpm/fpm/fpm_php_trace.c
Simple merge

diff --cc sapi/fpm/www.conf.in
Simple merge