From: Joe Watkins <krakjoe@php.net>
Date: Thu, 5 Jan 2017 06:54:37 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c370024c2c07eb047a77ed7f90a6cf921e0da6fb;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix php-fpm.service.in
---

c370024c2c07eb047a77ed7f90a6cf921e0da6fb
diff --cc sapi/fpm/php-fpm.service.in
index e2c807426b,c135f04c27..a4d533c197
--- a/sapi/fpm/php-fpm.service.in
+++ b/sapi/fpm/php-fpm.service.in
@@@ -1,17 -1,12 +1,17 @@@
 +# It's not recommended to modify this file in-place, because it
 +# will be overwritten during upgrades.  If you want to customize,
 +# the best way is to use the "systemctl edit" command.
 +
  [Unit]
  Description=The PHP FastCGI Process Manager
- After=syslog.target network.target
+ After=network.target
  
  [Service]
  Type=@php_fpm_systemd@
- PIDFile=@localstatedir@/run/php-fpm.pid
- ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
+ PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
+ ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf
  ExecReload=/bin/kill -USR2 $MAINPID
 +PrivateTmp=true
  
  [Install]
  WantedBy=multi-user.target