Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

Conflicts:
	sapi/fpm/config.m4

8 files changed, 51 insertions, 664 deletions

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index ad46717acd..e69de29bb2 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -1,653 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_ENABLE(fpm,,
-[  --enable-fpm              Enable building of the fpm SAPI executable], no, no)
-
-dnl configure checks {{{
-AC_DEFUN([AC_FPM_STDLIBS],
-[
-  AC_CHECK_FUNCS(setenv clearenv setproctitle)
-
-  AC_SEARCH_LIBS(socket, socket)
-  AC_SEARCH_LIBS(inet_addr, nsl)
-
-  AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])
-  AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])
-  AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
-  AC_CHECK_HEADERS([sysexits.h])
-])
-
-AC_DEFUN([AC_FPM_PRCTL],
-[
-  AC_MSG_CHECKING([for prctl])
-
-  AC_TRY_COMPILE([ #include <sys/prctl.h> ], [prctl(0, 0, 0, 0, 0);], [
-    AC_DEFINE([HAVE_PRCTL], 1, [do we have prctl?])
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-])
-
-AC_DEFUN([AC_FPM_CLOCK],
-[
-  have_clock_gettime=no
-
-  AC_MSG_CHECKING([for clock_gettime])
-
-  AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
-    have_clock_gettime=yes
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-
-  if test "$have_clock_gettime" = "no"; then
-    AC_MSG_CHECKING([for clock_gettime in -lrt])
-
-    SAVED_LIBS="$LIBS"
-    LIBS="$LIBS -lrt"
-
-    AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
-      have_clock_gettime=yes
-      AC_MSG_RESULT([yes])
-    ], [
-      LIBS="$SAVED_LIBS"
-      AC_MSG_RESULT([no])
-    ])
-  fi
-
-  if test "$have_clock_gettime" = "yes"; then
-    AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [do we have clock_gettime?])
-  fi
-
-  have_clock_get_time=no
-
-  if test "$have_clock_gettime" = "no"; then
-    AC_MSG_CHECKING([for clock_get_time])
-
-    AC_TRY_RUN([ #include <mach/mach.h>
-      #include <mach/clock.h>
-      #include <mach/mach_error.h>
-
-      int main()
-      {
-        kern_return_t ret; clock_serv_t aClock; mach_timespec_t aTime;
-        ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &aClock);
-
-        if (ret != KERN_SUCCESS) {
-          return 1;
-        }
-
-        ret = clock_get_time(aClock, &aTime);
-        if (ret != KERN_SUCCESS) {
-          return 2;
-        }
-
-        return 0;
-      }
-    ], [
-      have_clock_get_time=yes
-      AC_MSG_RESULT([yes])
-    ], [
-      AC_MSG_RESULT([no])
-    ])
-  fi
-
-  if test "$have_clock_get_time" = "yes"; then
-    AC_DEFINE([HAVE_CLOCK_GET_TIME], 1, [do we have clock_get_time?])
-  fi
-])
-
-AC_DEFUN([AC_FPM_TRACE],
-[
-  have_ptrace=no
-  have_broken_ptrace=no
-
-  AC_MSG_CHECKING([for ptrace])
-
-  AC_TRY_COMPILE([
-    #include <sys/types.h>
-    #include <sys/ptrace.h> ], [ptrace(0, 0, (void *) 0, 0);], [
-    have_ptrace=yes
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-
-  if test "$have_ptrace" = "yes"; then
-    AC_MSG_CHECKING([whether ptrace works])
-
-    AC_TRY_RUN([
-      #include <unistd.h>
-      #include <signal.h>
-      #include <sys/wait.h>
-      #include <sys/types.h>
-      #include <sys/ptrace.h>
-      #include <errno.h>
-
-      #if !defined(PTRACE_ATTACH) && defined(PT_ATTACH)
-      #define PTRACE_ATTACH PT_ATTACH
-      #endif
-
-      #if !defined(PTRACE_DETACH) && defined(PT_DETACH)
-      #define PTRACE_DETACH PT_DETACH
-      #endif
-
-      #if !defined(PTRACE_PEEKDATA) && defined(PT_READ_D)
-      #define PTRACE_PEEKDATA PT_READ_D
-      #endif
-
-      int main()
-      {
-        long v1 = (unsigned int) -1; /* copy will fail if sizeof(long) == 8 and we've got "int ptrace()" */
-        long v2;
-        pid_t child;
-        int status;
-
-        if ( (child = fork()) ) { /* parent */
-          int ret = 0;
-
-          if (0 > ptrace(PTRACE_ATTACH, child, 0, 0)) {
-            return 2;
-          }
-
-          waitpid(child, &status, 0);
-
-      #ifdef PT_IO
-          struct ptrace_io_desc ptio = {
-            .piod_op = PIOD_READ_D,
-            .piod_offs = &v1,
-            .piod_addr = &v2,
-            .piod_len = sizeof(v1)
-          };
-
-          if (0 > ptrace(PT_IO, child, (void *) &ptio, 0)) {
-            ret = 3;
-          }
-      #else
-          errno = 0;
-
-          v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);
-
-          if (errno) {
-            ret = 4;
-          }
-      #endif
-          ptrace(PTRACE_DETACH, child, (void *) 1, 0);
-
-          kill(child, SIGKILL);
-
-          return ret ? ret : (v1 != v2);
-        }
-        else { /* child */
-          sleep(10);
-          return 0;
-        }
-      }
-    ], [
-      AC_MSG_RESULT([yes])
-    ], [
-      have_ptrace=no
-      have_broken_ptrace=yes
-      AC_MSG_RESULT([no])
-    ], [
-      AC_MSG_RESULT([skipped (cross compiling)])
-    ])
-  fi
-
-  if test "$have_ptrace" = "yes"; then
-    AC_DEFINE([HAVE_PTRACE], 1, [do we have ptrace?])
-  fi
-
-  have_mach_vm_read=no
-
-  if test "$have_broken_ptrace" = "yes"; then
-    AC_MSG_CHECKING([for mach_vm_read])
-
-    AC_TRY_COMPILE([ #include <mach/mach.h>
-      #include <mach/mach_vm.h>
-    ], [
-      mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
-    ], [
-      have_mach_vm_read=yes
-      AC_MSG_RESULT([yes])
-    ], [
-      AC_MSG_RESULT([no])
-    ])
-  fi
-
-  if test "$have_mach_vm_read" = "yes"; then
-    AC_DEFINE([HAVE_MACH_VM_READ], 1, [do we have mach_vm_read?])
-  fi
-
-  proc_mem_file=""
-
-  if test -r /proc/$$/mem ; then
-    proc_mem_file="mem"
-  else
-    if test -r /proc/$$/as ; then
-      proc_mem_file="as"
-    fi
-  fi
-
-  if test -n "$proc_mem_file" ; then
-    AC_MSG_CHECKING([for proc mem file])
-  
-    AC_TRY_RUN([
-      #define _GNU_SOURCE
-      #define _FILE_OFFSET_BITS 64
-      #include <stdint.h>
-      #include <unistd.h>
-      #include <sys/types.h>
-      #include <sys/stat.h>
-      #include <fcntl.h>
-      #include <stdio.h>
-      int main()
-      {
-        long v1 = (unsigned int) -1, v2 = 0;
-        char buf[128];
-        int fd;
-        sprintf(buf, "/proc/%d/$proc_mem_file", getpid());
-        fd = open(buf, O_RDONLY);
-        if (0 > fd) {
-          return 1;
-        }
-        if (sizeof(long) != pread(fd, &v2, sizeof(long), (uintptr_t) &v1)) {
-          close(fd);
-          return 1;
-        }
-        close(fd);
-        return v1 != v2;
-      }
-    ], [
-      AC_MSG_RESULT([$proc_mem_file])
-    ], [
-      proc_mem_file=""
-      AC_MSG_RESULT([no])
-    ], [
-      AC_MSG_RESULT([skipped (cross compiling)])
-    ])
-  fi
-  
-  if test -n "$proc_mem_file"; then
-    AC_DEFINE_UNQUOTED([PROC_MEM_FILE], "$proc_mem_file", [/proc/pid/mem interface])
-  fi
-  
-  fpm_trace_type=""
-
-  if test "$have_ptrace" = "yes"; then
-    fpm_trace_type=ptrace
-    
-  elif test -n "$proc_mem_file"; then
-    fpm_trace_type=pread
-    
-  elif test "$have_mach_vm_read" = "yes" ; then
-    fpm_trace_type=mach
-    
-  else
-    AC_MSG_WARN([FPM Trace - ptrace, pread, or mach: could not be found])    
-  fi
-  
-])
-
-AC_DEFUN([AC_FPM_BUILTIN_ATOMIC],
-[
-  AC_MSG_CHECKING([if gcc supports __sync_bool_compare_and_swap])
-  AC_TRY_LINK(,
-  [
-    int variable = 1;
-    return (__sync_bool_compare_and_swap(&variable, 1, 2)
-           && __sync_add_and_fetch(&variable, 1)) ? 1 : 0;
-  ],
-  [
-    AC_MSG_RESULT([yes])
-    AC_DEFINE(HAVE_BUILTIN_ATOMIC, 1, [Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o.])
-  ],
-  [
-    AC_MSG_RESULT([no])
-  ])
-])
-
-AC_DEFUN([AC_FPM_LQ],
-[
-  have_lq=no
-
-  AC_MSG_CHECKING([for TCP_INFO])
-
-  AC_TRY_COMPILE([ #include <netinet/tcp.h> ], [struct tcp_info ti; int x = TCP_INFO;], [
-    have_lq=tcp_info
-    AC_MSG_RESULT([yes])
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-
-  if test "$have_lq" = "tcp_info"; then
-    AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?])
-  fi
-
-  if test "$have_lq" = "no" ; then
-    AC_MSG_CHECKING([for SO_LISTENQLEN])
-
-    AC_TRY_COMPILE([ #include <sys/socket.h> ], [int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;], [
-      have_lq=so_listenq
-      AC_MSG_RESULT([yes])
-    ], [
-      AC_MSG_RESULT([no])
-    ])
-
-    if test "$have_lq" = "tcp_info"; then
-      AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?])
-    fi
-  fi
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_SYSCONF],
-[
-	AC_MSG_CHECKING([for sysconf])
-
-	AC_TRY_COMPILE([ #include <unistd.h> ], [sysconf(_SC_CLK_TCK);], [
-		AC_DEFINE([HAVE_SYSCONF], 1, [do we have sysconf?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_TIMES],
-[
-	AC_MSG_CHECKING([for times])
-
-	AC_TRY_COMPILE([ #include <sys/times.h> ], [struct tms t; times(&t);], [
-		AC_DEFINE([HAVE_TIMES], 1, [do we have times?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_KQUEUE],
-[
-	AC_MSG_CHECKING([for kqueue])
-
-	AC_TRY_COMPILE(
-	[ 
-		#include <sys/types.h>
-		#include <sys/event.h>
-		#include <sys/time.h>
-	], [
-		int kfd;
-		struct kevent k;
-		kfd = kqueue();
-		/* 0 -> STDIN_FILENO */
-		EV_SET(&k, 0, EVFILT_READ , EV_ADD | EV_CLEAR, 0, 0, NULL);
-	], [
-		AC_DEFINE([HAVE_KQUEUE], 1, [do we have kqueue?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_PORT],
-[
-	AC_MSG_CHECKING([for port framework])
-
-	AC_TRY_COMPILE(
-	[ 
-		#include <port.h>
-	], [
-		int port;
-
-		port = port_create();
-		if (port < 0) {
-			return 1;
-		}
-	], [
-		AC_DEFINE([HAVE_PORT], 1, [do we have port framework?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_DEVPOLL],
-[
-	AC_MSG_CHECKING([for /dev/poll])
-
-	AC_TRY_COMPILE(
-	[ 
-		#include <stdio.h>
-		#include <sys/devpoll.h>
-	], [
-		int n, dp;
-		struct dvpoll dvp;
-		dp = 0;
-		dvp.dp_fds = NULL;
-		dvp.dp_nfds = 0;
-		dvp.dp_timeout = 0;
-		n = ioctl(dp, DP_POLL, &dvp)
-	], [
-		AC_DEFINE([HAVE_DEVPOLL], 1, [do we have /dev/poll?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_EPOLL],
-[
-	AC_MSG_CHECKING([for epoll])
-
-	AC_TRY_COMPILE(
-	[ 
-		#include <sys/epoll.h>
-	], [
-		int epollfd;
-		struct epoll_event e;
-
-		epollfd = epoll_create(1);
-		if (epollfd < 0) {
-			return 1;
-		}
-
-		e.events = EPOLLIN | EPOLLET;
-		e.data.fd = 0;
-
-		if (epoll_ctl(epollfd, EPOLL_CTL_ADD, 0, &e) == -1) {
-			return 1;
-		}
-
-		e.events = 0;
-		if (epoll_wait(epollfd, &e, 1, 1) < 0) {
-			return 1;
-		}
-	], [
-		AC_DEFINE([HAVE_EPOLL], 1, [do we have epoll?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_POLL],
-[
-	AC_MSG_CHECKING([for poll])
-
-	AC_TRY_COMPILE(
-	[ 
-		#include <poll.h>
-	], [
-		struct pollfd fds[2];
-
-		fds[0].fd = 0;
-		fds[0].events = POLLIN;
-
-		fds[1].fd = 0;
-		fds[1].events = POLLIN;
-
-		 poll(fds, 2, 1);
-	], [
-		AC_DEFINE([HAVE_POLL], 1, [do we have poll?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-AC_DEFUN([AC_FPM_SELECT],
-[
-	AC_MSG_CHECKING([for select])
-
-	AC_TRY_COMPILE(
-	[ 
-		/* According to POSIX.1-2001 */
-		#include <sys/select.h>
-
-		/* According to earlier standards */
-		#include <sys/time.h>
-		#include <sys/types.h>
-		#include <unistd.h>
-	], [
-		fd_set fds;
-		struct timeval t;
-		t.tv_sec = 0;
-		t.tv_usec = 42;
-		FD_ZERO(&fds);
-		/* 0 -> STDIN_FILENO */
-		FD_SET(0, &fds);
-		select(FD_SETSIZE, &fds, NULL, NULL, &t);
-	], [
-		AC_DEFINE([HAVE_SELECT], 1, [do we have select?])
-		AC_MSG_RESULT([yes])
-	], [
-		AC_MSG_RESULT([no])
-	])
-])
-dnl }}}
-
-
-AC_MSG_CHECKING(for FPM build)
-if test "$PHP_FPM" != "no"; then
-  AC_MSG_RESULT($PHP_FPM)
-
-  AC_FPM_STDLIBS
-  AC_FPM_PRCTL
-  AC_FPM_CLOCK
-  AC_FPM_TRACE
-  AC_FPM_BUILTIN_ATOMIC
-  AC_FPM_LQ
-	AC_FPM_SYSCONF
-	AC_FPM_TIMES
-	AC_FPM_KQUEUE
-	AC_FPM_PORT
-	AC_FPM_DEVPOLL
-	AC_FPM_EPOLL
-	AC_FPM_POLL
-	AC_FPM_SELECT
-
-  PHP_ARG_WITH(fpm-user,,
-  [  --with-fpm-user[=USER]  Set the user for php-fpm to run as. (default: nobody)], nobody, no)
-
-  PHP_ARG_WITH(fpm-group,,
-  [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
-                  should usually be set to match the fpm username (default: nobody)], nobody, no)
-
-  if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
-    php_fpm_user="nobody"
-  else
-    php_fpm_user="$PHP_FPM_USER"
-  fi
-
-  if test -z "$PHP_FPM_GROUP" -o "$PHP_FPM_GROUP" = "yes" -o "$PHP_FPM_GROUP" = "no"; then
-    php_fpm_group="nobody"
-  else
-    php_fpm_group="$PHP_FPM_GROUP"
-  fi
-
-  PHP_SUBST_OLD(php_fpm_user)
-  PHP_SUBST_OLD(php_fpm_group)
-  php_fpm_sysconfdir=`eval echo $sysconfdir`
-  PHP_SUBST_OLD(php_fpm_sysconfdir)
-  php_fpm_localstatedir=`eval echo $localstatedir`
-  PHP_SUBST_OLD(php_fpm_localstatedir)
-  php_fpm_prefix=`eval echo $prefix`
-  PHP_SUBST_OLD(php_fpm_prefix)
-
-  AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
-  AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
-
-  PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
-  PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html)
-  PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
-
-  SAPI_FPM_PATH=sapi/fpm/php-fpm
-  
-  if test "$fpm_trace_type" && test -f "$abs_srcdir/sapi/fpm/fpm/fpm_trace_$fpm_trace_type.c"; then
-    PHP_FPM_TRACE_FILES="fpm/fpm_trace.c fpm/fpm_trace_$fpm_trace_type.c"
-  fi
-  
-  PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
- 
-  PHP_FPM_FILES="fpm/fastcgi.c \
-    fpm/fpm.c \
-    fpm/fpm_children.c \
-    fpm/fpm_cleanup.c \
-    fpm/fpm_clock.c \
-    fpm/fpm_conf.c \
-    fpm/fpm_env.c \
-    fpm/fpm_events.c \
-		fpm/fpm_log.c \
-    fpm/fpm_main.c \
-    fpm/fpm_php.c \
-    fpm/fpm_php_trace.c \
-    fpm/fpm_process_ctl.c \
-    fpm/fpm_request.c \
-    fpm/fpm_shm.c \
-    fpm/fpm_scoreboard.c \
-    fpm/fpm_signals.c \
-    fpm/fpm_sockets.c \
-    fpm/fpm_status.c \
-    fpm/fpm_stdio.c \
-    fpm/fpm_unix.c \
-    fpm/fpm_worker_pool.c \
-    fpm/zlog.c \
-		fpm/events/select.c \
-		fpm/events/poll.c \
-		fpm/events/epoll.c \
-		fpm/events/kqueue.c \
-		fpm/events/devpoll.c \
-		fpm/events/port.c \
-  "
-
-  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
-
-  case $host_alias in
-      *aix*)
-        BUILD_FPM="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-        ;;
-      *darwin*)
-        BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FPM_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-      ;;
-      *)
-        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(FPM_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-      ;;
-  esac
-
-  PHP_SUBST(SAPI_FPM_PATH)
-  PHP_SUBST(BUILD_FPM)
-
-else
-  AC_MSG_RESULT(no)
-fi
diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c
index 2f42175d89..b866f37f2d 100644
--- a/sapi/fpm/fpm/fpm.c
+++ b/sapi/fpm/fpm/fpm.c
@@ -42,7 +42,7 @@ struct fpm_globals_s fpm_globals = {
 	.send_config_pipe = {0, 0},
 };
 
-int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root) /* {{{ */
+int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root, int force_daemon) /* {{{ */
 {
 	fpm_globals.argc = argc;
 	fpm_globals.argv = argv;
@@ -55,7 +55,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
 
 	if (0 > fpm_php_init_main()           ||
 	    0 > fpm_stdio_init_main()         ||
-	    0 > fpm_conf_init_main(test_conf) ||
+	    0 > fpm_conf_init_main(test_conf, force_daemon) ||
 	    0 > fpm_unix_init_main()          ||
 	    0 > fpm_scoreboard_init_main()    ||
 	    0 > fpm_pctl_init_main()          ||
diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h
index c576876386..65d0e0d691 100644
--- a/sapi/fpm/fpm/fpm.h
+++ b/sapi/fpm/fpm/fpm.h
@@ -37,7 +37,7 @@
 
 
 int fpm_run(int *max_requests);
-int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root);
+int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root, int force_daemon);
 
 struct fpm_globals_s {
 	pid_t parent_pid;
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index dfe6792c05..25e2cc43a1 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1115,7 +1115,7 @@ int fpm_conf_write_pid() /* {{{ */
 }
 /* }}} */
 
-static int fpm_conf_post_process(TSRMLS_D) /* {{{ */
+static int fpm_conf_post_process(int force_daemon TSRMLS_DC) /* {{{ */
 {
 	struct fpm_worker_pool_s *wp;
 
@@ -1123,6 +1123,11 @@ static int fpm_conf_post_process(TSRMLS_D) /* {{{ */
 		fpm_evaluate_full_path(&fpm_global_config.pid_file, NULL, PHP_LOCALSTATEDIR, 0);
 	}
 
+	if (force_daemon >= 0) {
+		/* forced from command line options */
+		fpm_global_config.daemonize = force_daemon;
+	}
+
 	fpm_globals.log_level = fpm_global_config.log_level;
 
 	if (fpm_global_config.process_max < 0) {
@@ -1584,7 +1589,7 @@ static void fpm_conf_dump() /* {{{ */
 }
 /* }}} */
 
-int fpm_conf_init_main(int test_conf) /* {{{ */
+int fpm_conf_init_main(int test_conf, int force_daemon) /* {{{ */
 {
 	int ret;
 	TSRMLS_FETCH();
@@ -1630,7 +1635,7 @@ int fpm_conf_init_main(int test_conf) /* {{{ */
 		return -1;
 	}
 
-	if (0 > fpm_conf_post_process(TSRMLS_C)) {
+	if (0 > fpm_conf_post_process(force_daemon TSRMLS_CC)) {
 		zlog(ZLOG_ERROR, "failed to post process the configuration");
 		return -1;
 	}
diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h
index f780f03891..dc54133d43 100644
--- a/sapi/fpm/fpm/fpm_conf.h
+++ b/sapi/fpm/fpm/fpm_conf.h
@@ -97,7 +97,7 @@ enum {
 	PM_STYLE_ONDEMAND = 3
 };
 
-int fpm_conf_init_main(int test_conf);
+int fpm_conf_init_main(int test_conf, int force_daemon);
 int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
 int fpm_conf_write_pid();
 int fpm_conf_unlink_pid();
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 925cbc1b74..edd75be5ae 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -155,6 +155,8 @@ static const opt_struct OPTIONS[] = {
 	{'p', 1, "prefix"},
 	{'g', 1, "pid"},
 	{'R', 0, "allow-to-run-as-root"},
+	{'D', 0, "daemonize"},
+	{'F', 0, "nodaemonize"},
 	{'-', 0, NULL} /* end of args */
 };
 
@@ -912,7 +914,7 @@ static void php_cgi_usage(char *argv0)
 		prog = "php";
 	}
 
-	php_printf(	"Usage: %s [-n] [-e] [-h] [-i] [-m] [-v] [-t] [-p <prefix>] [-g <pid>] [-c <file>] [-d foo[=bar]] [-y <file>]\n"
+	php_printf(	"Usage: %s [-n] [-e] [-h] [-i] [-m] [-v] [-t] [-p <prefix>] [-g <pid>] [-c <file>] [-d foo[=bar]] [-y <file>] [-D] [-F]\n"
 				"  -c <path>|<file> Look for php.ini file in this directory\n"
 				"  -n               No php.ini file will be used\n"
 				"  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
@@ -928,6 +930,9 @@ static void php_cgi_usage(char *argv0)
 				"  -y, --fpm-config <file>\n"
 				"                   Specify alternative path to FastCGI process manager config file.\n"
 				"  -t, --test       Test FPM configuration and exit\n"
+				"  -D, --daemonize  force to run in background, and ignore daemonize option from config file\n"
+				"  -F, --nodaemonize\n"
+				"                   force to stay in foreground, and ignore daemonize option from config file\n"
 				"  -R, --allow-to-run-as-root\n"
 				"                   Allow pool to run as root (disabled by default)\n",
 				prog, PHP_PREFIX);
@@ -1550,6 +1555,7 @@ int main(int argc, char *argv[])
 	char *fpm_prefix = NULL;
 	char *fpm_pid = NULL;
 	int test_conf = 0;
+	int force_daemon = -1;
 	int php_information = 0;
 	int php_allow_to_run_as_root = 0;
 
@@ -1670,6 +1676,14 @@ int main(int argc, char *argv[])
 				php_allow_to_run_as_root = 1;
 				break;
 
+			case 'D': /* daemonize */
+				force_daemon = 1;
+				break;
+
+			case 'F': /* nodaemonize */
+				force_daemon = 0;
+				break;
+
 			default:
 			case 'h':
 			case '?':
@@ -1797,7 +1811,7 @@ consult the installation file that came with this distribution, or visit \n\
 		}
 	}
 
-	if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root)) {
+	if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon)) {
 
 		if (fpm_globals.send_config_pipe[1]) {
 			int writeval = 0;
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index dc66310c3d..3edd64fe19 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -54,7 +54,7 @@ case "$1" in
 	start)
 		echo -n "Starting php-fpm "
 
-		$php_fpm_BIN $php_opts
+		$php_fpm_BIN --daemonize $php_opts
 
 		if [ "$?" != 0 ] ; then
 			echo " failed"
diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
index 6c9c6d6274..a4e7e74e20 100644
--- a/sapi/fpm/php-fpm.8.in
+++ b/sapi/fpm/php-fpm.8.in
@@ -99,6 +99,20 @@ Test FPM configuration file and exit
 If called twice (-tt), the configuration is dumped before exiting.
 .TP
 .PD 0
+.B \-\-daemonize
+.TP
+.PD 1
+.B \-D
+Force to run in background and ignore daemonize option from configuration file.
+.TP
+.PD 0
+.B \-\-nodaemonize
+.TP
+.PD 1
+.B \-F
+Force to stay in foreground and ignore daemonize option from configuration file.
+.TP
+.PD 0
 .B \-\-zend\-extension \fIfile\fP
 .TP
 .PD 1
@@ -113,13 +127,20 @@ The configuration file for the php-fpm daemon.
 .B php.ini
 The standard php configuration file.
 .SH EXAMPLES
-You should use the init script provided to start and stop the php-fpm daemon. This situation applies for any unix systems which use init.d for their main process manager.
+For any unix systems which use init.d for their main process manager, you should use the init script provided to start and stop the php-fpm daemon.
 .P
 .PD 1
 .RS
 sudo /etc/init.d/php-fpm start
 .RE
 .TP
+For any unix systems which use systemd for their main process manager, you should use the unit file provided to start and stop the php-fpm daemon.
+.P
+.PD 1
+.RS
+sudo systemctl start php-fpm.service
+.RE
+.TP
 If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals:
 .P
 .PD 0