]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sat, 29 Nov 2014 15:52:25 +0000 (16:52 +0100)
committerRemi Collet <remi@php.net>
Sat, 29 Nov 2014 15:52:25 +0000 (16:52 +0100)
* PHP-5.6:
  Move chown to fpm_unix_set_socket_premissions()

1  2 
sapi/fpm/fpm/fpm_sockets.c

Simple merge