]> granicus.if.org Git - php/commit
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)
commitbfa9c4609dd374af606034c17bae17d3aab2ed5a
treeaf62d49b730b45e137dfc637d915aeb03fbcd63f
parent74163b36d166dfab9dfa1d02d21fb085a1b664f8
parente1d4ac426c817377cbe01287b6ada824146d26c9
Merge branch 'PHP-5.6'

* PHP-5.6:
  Move chown to fpm_unix_set_socket_premissions()
sapi/fpm/fpm/fpm_sockets.c