]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7691926 e988377)
Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
authorAntony Dovgal <tony2001@php.net>
Thu, 16 Jan 2014 13:36:03 +0000 (17:36 +0400)
committerAntony Dovgal <tony2001@php.net>
Thu, 16 Jan 2014 13:36:03 +0000 (17:36 +0400)
commit998f506b6d06d85e5d7a1c446915170dfdd45845
tree3c53a39ad1824c174ce37964384f009e4526e3d2tree | snapshot
parent7691926bbeb8c36b2a8f19f18d4f9129fcd4c08acommit | diff
parente9883779a0d00fef3481af2806a918abe33fd3f4commit | diff
Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src

* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
run-tests.php diff1 | diff2 | blob | history
sapi/fpm/config.m4 diff1 | diff2 | blob | history
sapi/fpm/fpm/fpm_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.