com php-src: Merge branch 'pull-request/2117': sapi/fpm/fpm/fpm _php_trace.c sapi/fpm/www.conf.in
| From: | Joe Watkins | Date: | Sun, 01 Jan 2017 15:47:36 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/2117': sapi/fpm/fpm/fpm _php_trace.c sapi/fpm/www.conf.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96497@lists.php.net to get a copy of this message | ||
Commit: 5a15c9470c3d932dcb8eef518be1dcc33596e763
Author: Joe Watkins <krakjoe@php.net> Sun, 1 Jan 2017 15:47:36 +0000
Parents: b771790429ee5c1f709d4a997b28ed4cf1e0c8fd ba65b37b262bd44334fefc1f4354cddb1bd008d5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a15c9470c3d932dcb8eef518be1dcc33596e763
Log:
Merge branch 'pull-request/2117'
* pull-request/2117:
Allow to configure php-fpm slow log trace callers limit
Changed paths:
MM sapi/fpm/fpm/fpm_php_trace.c
MM sapi/fpm/www.conf.in
Diff: