summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2010-04-13 12:13:24 (GMT)
committerAntony Dovgal <tony2001@php.net>2010-04-13 12:13:24 (GMT)
commit3ebdadf8f6c1a6502e3ba07640720198b2933d5b (patch)
tree79f30f997e8bb13f708a9fe1225ace846168baab /sapi
parent6169d91ba759528babafc0599dc4ab975561121a (diff)
downloadphp-3ebdadf8f6c1a6502e3ba07640720198b2933d5b.tar.gz
prepare to re-add newer FPM version
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/LICENSE23
-rw-r--r--sapi/fpm/Makefile.frag2
-rw-r--r--sapi/fpm/conf/init.d.php-fpm.in135
-rw-r--r--sapi/fpm/conf/nginx-site-conf.sample.in46
-rw-r--r--sapi/fpm/conf/php-fpm.conf.in159
-rw-r--r--sapi/fpm/config.m4672
-rw-r--r--sapi/fpm/fpm/fastcgi.c1298
-rw-r--r--sapi/fpm/fpm/fastcgi.h149
-rw-r--r--sapi/fpm/fpm/fpm.c82
-rw-r--r--sapi/fpm/fpm/fpm.h28
-rw-r--r--sapi/fpm/fpm/fpm_arrays.h110
-rw-r--r--sapi/fpm/fpm/fpm_atomic.h85
-rw-r--r--sapi/fpm/fpm/fpm_children.c385
-rw-r--r--sapi/fpm/fpm/fpm_children.h33
-rw-r--r--sapi/fpm/fpm/fpm_cleanup.c51
-rw-r--r--sapi/fpm/fpm/fpm_cleanup.h21
-rw-r--r--sapi/fpm/fpm/fpm_clock.c115
-rw-r--r--sapi/fpm/fpm/fpm_clock.h13
-rw-r--r--sapi/fpm/fpm/fpm_conf.c532
-rw-r--r--sapi/fpm/fpm/fpm_conf.h73
-rw-r--r--sapi/fpm/fpm/fpm_config.h40
-rw-r--r--sapi/fpm/fpm/fpm_env.c125
-rw-r--r--sapi/fpm/fpm/fpm_env.h24
-rw-r--r--sapi/fpm/fpm/fpm_events.c135
-rw-r--r--sapi/fpm/fpm/fpm_events.h16
-rw-r--r--sapi/fpm/fpm/fpm_main.c2253
-rw-r--r--sapi/fpm/fpm/fpm_php.c189
-rw-r--r--sapi/fpm/fpm/fpm_php.h22
-rw-r--r--sapi/fpm/fpm/fpm_php_trace.c171
-rw-r--r--sapi/fpm/fpm/fpm_php_trace.h13
-rw-r--r--sapi/fpm/fpm/fpm_process_ctl.c354
-rw-r--r--sapi/fpm/fpm/fpm_process_ctl.h39
-rw-r--r--sapi/fpm/fpm/fpm_request.c164
-rw-r--r--sapi/fpm/fpm/fpm_request.h27
-rw-r--r--sapi/fpm/fpm/fpm_shm.c100
-rw-r--r--sapi/fpm/fpm/fpm_shm.h22
-rw-r--r--sapi/fpm/fpm/fpm_shm_slots.c127
-rw-r--r--sapi/fpm/fpm/fpm_shm_slots.h43
-rw-r--r--sapi/fpm/fpm/fpm_signals.c252
-rw-r--r--sapi/fpm/fpm/fpm_signals.h16
-rw-r--r--sapi/fpm/fpm/fpm_sockets.c427
-rw-r--r--sapi/fpm/fpm/fpm_sockets.h37
-rw-r--r--sapi/fpm/fpm/fpm_stdio.c286
-rw-r--r--sapi/fpm/fpm/fpm_stdio.h20
-rw-r--r--sapi/fpm/fpm/fpm_str.h49
-rw-r--r--sapi/fpm/fpm/fpm_trace.c46
-rw-r--r--sapi/fpm/fpm/fpm_trace.h17
-rw-r--r--sapi/fpm/fpm/fpm_trace_mach.c102
-rw-r--r--sapi/fpm/fpm/fpm_trace_pread.c67
-rw-r--r--sapi/fpm/fpm/fpm_trace_ptrace.c85
-rw-r--r--sapi/fpm/fpm/fpm_unix.c289
-rw-r--r--sapi/fpm/fpm/fpm_unix.h17
-rw-r--r--sapi/fpm/fpm/fpm_worker_pool.c69
-rw-r--r--sapi/fpm/fpm/fpm_worker_pool.h46
-rw-r--r--sapi/fpm/fpm/xml_config.c278
-rw-r--r--sapi/fpm/fpm/xml_config.h43
-rw-r--r--sapi/fpm/fpm/zlog.c113
-rw-r--r--sapi/fpm/fpm/zlog.h34
-rw-r--r--sapi/fpm/man/php-fpm.1.in186
59 files changed, 0 insertions, 10355 deletions
diff --git a/sapi/fpm/LICENSE b/sapi/fpm/LICENSE
deleted file mode 100644
index 4e1dd99..0000000
--- a/sapi/fpm/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2007-2009, Andrei Nigmatulin
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag
deleted file mode 100644
index 5a7b724..0000000
--- a/sapi/fpm/Makefile.frag
+++ /dev/null
@@ -1,2 +0,0 @@
-$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
- $(BUILD_FPM)
diff --git a/sapi/fpm/conf/init.d.php-fpm.in b/sapi/fpm/conf/init.d.php-fpm.in
deleted file mode 100644
index 5dd11c9..0000000
--- a/sapi/fpm/conf/init.d.php-fpm.in
+++ /dev/null
@@ -1,135 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides: @php_fpm_bin@
-# Required-Start: $all
-# Required-Stop: $all
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: starts @php_fpm_bin@
-# Description: starts the PHP FastCGI Process Manager daemon
-### END INIT INFO
-
-php_fpm_BIN=@php_fpm_bin_path@
-php_fpm_CONF=@php_fpm_conf_path@
-php_fpm_PID=@php_fpm_pid_path@
-
-
-php_opts="--fpm-config $php_fpm_CONF"
-
-
-wait_for_pid () {
- try=0
-
- while test $try -lt 35 ; do
-
- case "$1" in
- 'created')
- if [ -f "$2" ] ; then
- try=''
- break
- fi
- ;;
-
- 'removed')
- if [ ! -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- esac
-
- echo -n .
- try=`expr $try + 1`
- sleep 1
-
- done
-
-}
-
-case "$1" in
- start)
- echo -n "Starting @php_fpm_bin@ "
-
- $php_fpm_BIN $php_opts
-
- if [ "$?" != 0 ] ; then
- echo " failed"
- exit 1
- fi
-
- wait_for_pid created $php_fpm_PID
-
- if [ -n "$try" ] ; then
- echo " failed"
- exit 1
- else
- echo " done"
- fi
- ;;
-
- stop)
- echo -n "Gracefully shutting down @php_fpm_bin@ "
-
- if [ ! -r $php_fpm_PID ] ; then
- echo "warning, no pid file found - php-fpm is not running ?"
- exit 1
- fi
-
- kill -QUIT `cat $php_fpm_PID`
-
- wait_for_pid removed $php_fpm_PID
-
- if [ -n "$try" ] ; then
- echo " failed. Use force-exit"
- exit 1
- else
- echo " done"
- fi
- ;;
-
- force-quit)
- echo -n "Terminating @php_fpm_bin@ "
-
- if [ ! -r $php_fpm_PID ] ; then
- echo "warning, no pid file found - php-fpm is not running ?"
- exit 1
- fi
-
- kill -TERM `cat $php_fpm_PID`
-
- wait_for_pid removed $php_fpm_PID
-
- if [ -n "$try" ] ; then
- echo " failed"
- exit 1
- else
- echo " done"
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- reload)
-
- echo -n "Reload service @php_fpm_bin@ "
-
- if [ ! -r $php_fpm_PID ] ; then
- echo "warning, no pid file found - @php_fpm_bin@ is not running ?"
- exit 1
- fi
-
- kill -USR2 `cat $php_fpm_PID`
-
- echo " done"
- ;;
-
- *)
- echo "Usage: $0 {start|stop|force-quit|restart|reload}"
- exit 1
- ;;
-
-esac
diff --git a/sapi/fpm/conf/nginx-site-conf.sample.in b/sapi/fpm/conf/nginx-site-conf.sample.in
deleted file mode 100644
index 6791d9f..0000000
--- a/sapi/fpm/conf/nginx-site-conf.sample.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# @php_fpm_bin@ - PHP FastCGI Process Manager 'PHP-FPM'
-#
-# nginx-site-conf.sample:
-# Php Site configuration for nginx webserver
-#
-# 1. set $site_root /path/to/your/website;
-# 2. Rename this file. Copy it to /etc/nginx/sites-available, /etc/nginx/sites-enabled
-# 3. Restart nginx webserver, and @php_fpm_bin@ service.
-#
-
-server {
-
- set $site_root /var/www/nginx-site;
- server_name localhost;
- listen 80;
-
- access_log /var/log/nginx/localhost.access.log;
-
- location / {
- root $site_root;
- index index.html index.htm;
- }
-
- #error_page 404 /404.html;
-
- # redirect server error pages to the static page /50x.html
- #
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /var/www/nginx-default;
- }
-
- # pass the *.php scripts to @php_fpm_bin@ listening on port 9000
- #
- location ~ \.php$ {
-
- root $site_root;
- fastcgi_pass 127.0.0.1:9000;
- fastcgi_index index.php;
-
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- fastcgi_param SERVER_NAME $http_host;
- fastcgi_ignore_client_abort on;
- }
-}
diff --git a/sapi/fpm/conf/php-fpm.conf.in b/sapi/fpm/conf/php-fpm.conf.in
deleted file mode 100644
index b637ab8..0000000
--- a/sapi/fpm/conf/php-fpm.conf.in
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" ?>
-<configuration>
-
- All relative paths in this config are relative to php's install prefix
-
- <section name="global_options">
-
- Pid file
- <value name="pid_file">@php_fpm_pid_path@</value>
-
- Error log file
- <value name="error_log">@php_fpm_log_path@</value>
-
- Log level
- <value name="log_level">notice</value>
-
- When this amount of php processes exited with SIGSEGV or SIGBUS ...
- <value name="emergency_restart_threshold">10</value>
-
- ... in a less than this interval of time, a graceful restart will be initiated.
- Useful to work around accidental curruptions in accelerator's shared memory.
- <value name="emergency_restart_interval">1m</value>
-
- Time limit on waiting child's reaction on signals from master
- <value name="process_control_timeout">5s</value>
-
- Set to 'no' to debug fpm
- <value name="daemonize">yes</value>
-
- </section>
-
- <workers>
-
- <section name="pool">
-
- Name of pool. Used in logs and stats.
- <value name="name">default</value>
-
- Address to accept fastcgi requests on.
- Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
- <value name="listen_address">127.0.0.1:9000</value>
-
- <value name="listen_options">
-
- Set listen(2) backlog
- <value name="backlog">-1</value>
-
- Set permissions for unix socket, if one used.
- In Linux read/write permissions must be set in order to allow connections from web server.
- Many BSD-derrived systems allow connections regardless of permissions.
- <value name="owner">@php_fpm_user@</value>
- <value name="group">@php_fpm_group@</value>
- <value name="mode">0666</value>
- </value>
-
- Additional php.ini defines, specific to this pool of workers.
- These settings overwrite the values previously defined in the php.ini.
- <value name="php_defines">
- <!-- <value name="sendmail_path">/usr/sbin/sendmail -t -i</value> -->
- <!-- <value name="display_errors">0</value> -->
- <!-- <value name="error_log">/var/log/php-error.log</value> -->
- <!-- <value name="log_errors">true</value> -->
- </value>
-
- Unix user of processes
- <value name="user">@php_fpm_user@</value>
-
- Unix group of processes
- <value name="group">@php_fpm_group@</value>
-
- Process manager settings
- <value name="pm">
-
- Sets style of controling worker process count.
- Valid values are 'static' and 'apache-like'
- <value name="style">static</value>
-
- Sets the limit on the number of simultaneous requests that will be served.
- Equivalent to Apache MaxClients directive.
- Equivalent to PHP_FCGI_CHILDREN environment in original php.fcgi
- Used with any pm_style.
- <value name="max_children">5</value>
-
- Settings group for 'apache-like' pm style
- <value name="apache_like">
-
- Sets the number of server processes created on startup.
- Used only when 'apache-like' pm_style is selected
- <value name="StartServers">20</value>
-
- Sets the desired minimum number of idle server processes.
- Used only when 'apache-like' pm_style is selected
- <value name="MinSpareServers">5</value>
-
- Sets the desired maximum number of idle server processes.
- Used only when 'apache-like' pm_style is selected
- <value name="MaxSpareServers">35</value>
-
- </value>
-
- </value>
-
- The timeout (in seconds) for serving a single request after which the worker process will be terminated
- Should be used when 'max_execution_time' ini option does not stop script execution for some reason
- '0s' means 'off'
- <value name="request_terminate_timeout">0s</value>
-
- The timeout (in seconds) for serving of single request after which a php backtrace will be dumped to slow.log file
- '0s' means 'off'
- <value name="request_slowlog_timeout">0s</value>
-
- The log file for slow requests
- <value name="slowlog">@php_fpm_log_path@.slow</value>
-
- Set open file desc rlimit
- <value name="rlimit_files">1024</value>
-
- Set max core size rlimit
- <value name="rlimit_core">0</value>
-
- Chroot to this directory at the start, absolute path
- <value name="chroot"></value>
-
- Chdir to this directory at the start, absolute path
- <value name="chdir"></value>
-
- Redirect workers' stdout and stderr into main error log.
- If not set, they will be redirected to /dev/null, according to FastCGI specs
- <value name="catch_workers_output">yes</value>
-
- How much requests each process should execute before respawn.
- Useful to work around memory leaks in 3rd party libraries.
- For endless request processing please specify 0
- Equivalent to PHP_FCGI_MAX_REQUESTS
- <value name="max_requests">500</value>
-
- Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
- Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
- Makes sense only with AF_INET listening socket.
- <value name="allowed_clients">127.0.0.1</value>
-
- Pass environment variables like LD_LIBRARY_PATH
- All $VARIABLEs are taken from current environment
- <value name="environment">
- <value name="HOSTNAME">$HOSTNAME</value>
- <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
- <value name="TMP">/tmp</value>
- <value name="TMPDIR">/tmp</value>
- <value name="TEMP">/tmp</value>
- <value name="OSTYPE">$OSTYPE</value>
- <value name="MACHTYPE">$MACHTYPE</value>
- <value name="MALLOC_CHECK_">2</value>
- </value>
-
- </section>
-
- </workers>
-
-</configuration>
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
deleted file mode 100644
index 0775d4e..0000000
--- a/sapi/fpm/config.m4
+++ /dev/null
@@ -1,672 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-fpm_version="0.6.5"
-minimum_libevent_version="1.4.11"
-
-PHP_ARG_ENABLE(fpm,,
-[ --enable-fpm EXPERIMENTAL: Enable building of the fpm SAPI executable], no, no)
-
-if test -z "$PHP_LIBXML_DIR"; then
- PHP_ARG_WITH(libxml-dir, libxml2 install dir,
- [ --with-libxml-dir=DIR FPM: libxml2 install prefix], no, no)
-fi
-
-dnl libevent check function {{{
-dnl @synopsis AC_LIB_EVENT([MINIMUM-VERSION])
-dnl
-dnl Test for the libevent library of a particular version (or newer).
-dnl Source: http://svn.apache.org/repos/asf/incubator/thrift/trunk/aclocal/ax_lib_event.m4
-dnl Modified: This file was modified for autoconf-2.13 and the PHP_ARG_WITH macro.
-dnl
-dnl If no path to the installed libevent is given, the macro will first try
-dnl using no -I or -L flags, then searches under /usr, /usr/local, /opt,
-dnl and /opt/libevent.
-dnl If these all fail, it will try the $LIBEVENT_ROOT environment variable.
-dnl
-dnl This macro requires that #include <sys/types.h> works and defines u_char.
-dnl
-dnl This macro calls:
-dnl AC_SUBST(LIBEVENT_CFLAGS)
-dnl AC_SUBST(LIBEVENT_LIBS)
-dnl
-dnl And (if libevent is found):
-dnl AC_DEFINE(HAVE_LIBEVENT)
-dnl
-dnl It also leaves the shell variables "success" and "ac_have_libevent"
-dnl set to "yes" or "no".
-dnl
-dnl NOTE: This macro does not currently work for cross-compiling,
-dnl but it can be easily modified to allow it. (grep "cross").
-dnl
-dnl @category InstalledPackages
-dnl @category C
-dnl @version 2007-09-12
-dnl @license AllPermissive
-dnl
-dnl Copyright (C) 2009 David Reiss
-dnl Copying and distribution of this file, with or without modification,
-dnl are permitted in any medium without royalty provided the copyright
-dnl notice and this notice are preserved.
-
-AC_DEFUN([AC_LIB_EVENT_DO_CHECK],
-[
-# Save our flags.
-CPPFLAGS_SAVED="$CPPFLAGS"
-LDFLAGS_SAVED="$LDFLAGS"
-LIBS_SAVED="$LIBS"
-LD_LIBRARY_PATH_SAVED="$LD_LIBRARY_PATH"
-
-# Set our flags if we are checking a specific directory.
-if test -n "$ac_libevent_path" ; then
- LIBEVENT_CPPFLAGS="-I$ac_libevent_path/include"
- LIBEVENT_LDFLAGS="-L$ac_libevent_path/lib"
- LD_LIBRARY_PATH="$ac_libevent_path/lib:$LD_LIBRARY_PATH"
-else
- LIBEVENT_CPPFLAGS=""
- LIBEVENT_LDFLAGS=""
-fi
-
-# Required flag for libevent.
-LIBEVENT_LIBS="-levent"
-
-# Prepare the environment for compilation.
-CPPFLAGS="$CPPFLAGS $LIBEVENT_CPPFLAGS"
-LDFLAGS="$LDFLAGS $LIBEVENT_LDFLAGS"
-LIBS="$LIBS $LIBEVENT_LIBS"
-export CPPFLAGS
-export LDFLAGS
-export LIBS
-export LD_LIBRARY_PATH
-
-success=no
-
-# Compile, link, and run the program. This checks:
-# - event.h is available for including.
-# - event_get_version() is available for linking.
-# - The event version string is lexicographically greater
-# than the required version.
-AC_TRY_RUN([
-#include <sys/types.h>
-#include <event.h>
-
-int main(int argc, char *argv[])
-{
- const char* lib_version = event_get_version();
- const char* wnt_version = "$WANT_LIBEVENT_VERSION";
- for (;;) {
- /* If we reached the end of the want version. We have it. */
- if (*wnt_version == '\0' || *wnt_version == '-') {
- return 0;
- }
- /* If the want version continues but the lib version does not, */
- /* we are missing a letter. We don't have it. */
- if (*lib_version == '\0' || *lib_version == '-') {
- return 1;
- }
-
- /* In the 1.4 version numbering style, if there are more digits */
- /* in one version than the other, that one is higher. */
- int lib_digits;
- for (lib_digits = 0;
- lib_version[lib_digits] >= '0' &&
- lib_version[lib_digits] <= '9';
- lib_digits++)
- ;
- int wnt_digits;
- for (wnt_digits = 0;
- wnt_version[wnt_digits] >= '0' &&
- wnt_version[wnt_digits] <= '9';
- wnt_digits++)
- ;
- if (lib_digits > wnt_digits) {
- return 0;
- }
- if (lib_digits < wnt_digits) {
- return 1;
- }
- /* If we have greater than what we want. We have it. */
- if (*lib_version > *wnt_version) {
- return 0;
- }
- /* If we have less, we don't. */
- if (*lib_version < *wnt_version) {
- return 1;
- }
- lib_version++;
- wnt_version++;
- }
- return 0;
-}
-],[
-success=yes
-])
-
-# Restore flags.
-CPPFLAGS="$CPPFLAGS_SAVED"
-LDFLAGS="$LDFLAGS_SAVED"
-LIBS="$LIBS_SAVED"
-LD_LIBRARY_PATH="$LD_LIBRARY_PATH_SAVED"
-])
-
-AC_DEFUN([AC_LIB_EVENT],
-[
-
-PHP_ARG_WITH(libevent-dir,,
-[ --with-libevent-dir[=PATH] libevent install prefix, for fpm SAPI. (default: /usr/local)], /usr/local, yes)
-
-if test "$PHP_LIBEVENT_DIR" != "no"; then
- WANT_LIBEVENT_VERSION=ifelse([$1], ,1.2,$1)
-
- AC_MSG_CHECKING(for libevent >= $WANT_LIBEVENT_VERSION install prefix)
-
- libevent_prefix=$ac_default_prefix
- if test $prefix != "NONE" -a $prefix != "" -a $prefix != "no" ; then
- libevent_prefix=$prefix
- fi
-
- if test "$PHP_LIBEVENT_DIR" = "yes"; then
- PHP_LIBEVENT_DIR=$libevent_prefix
- fi
-
- if test "$PHP_LIBEVENT_DIR" != "yes" && test "$PHP_LIBEVENT_DIR" != "/usr/local"; then
- dnl don't try to be too smart, check only $PHP_LIBEVENT_DIR if specified
- ac_libevent_path=$PHP_LIBEVENT_DIR
- AC_LIB_EVENT_DO_CHECK
- if test "$success" = "no"; then
- AC_MSG_ERROR([Could not find libevent >= $WANT_LIBEVENT_VERSION in $PHP_LIBEVENT_DIR])
- fi
- else
- dnl check default prefixes then
- for ac_libevent_path in "" $PHP_LIBEVENT_DIR /usr /usr/local /opt /opt/local /opt/libevent ; do
- AC_LIB_EVENT_DO_CHECK
- if test "$success" = "yes"; then
- break;
- fi
- done
- fi
-
- if test "$success" != "yes" ; then
- AC_MSG_RESULT(no)
- ac_have_libevent=no
- AC_MSG_ERROR([libevent >= $WANT_LIBEVENT_VERSION could not be found])
- else
- AC_MSG_RESULT($ac_libevent_path)
- ac_have_libevent=yes
- AC_DEFINE(HAVE_LIBEVENT, 1, [define if libevent is available])
- fi
-
- LIBEVENT_LIBS="-levent"
-
- if test -n "$ac_libevent_path"; then
- LIBEVENT_CFLAGS="-I$ac_libevent_path/include"
- LIBEVENT_LIBS="-L$ac_libevent_path/$PHP_LIBDIR $LIBEVENT_LIBS"
- fi
-
- AC_SUBST(LIBEVENT_CFLAGS)
- AC_SUBST(LIBEVENT_LIBS)
-
-else
- AC_MSG_ERROR([FPM requires libevent >= $WANT_LIBEVENT_VERSION. Please specify libevent install prefix with --with-libevent-dir=yes])
-fi
-
-])
-dnl }}}
-
-dnl configure checks {{{
-AC_DEFUN([AC_FPM_CHECKS],
-[
- AC_FPM_STDLIBS
- AC_FPM_PRCTL
- AC_FPM_CLOCK
- AC_FPM_TRACE
-])
-
-AC_DEFUN([AC_FPM_STDLIBS],
-[
- AC_CHECK_FUNCS(setenv clearenv)
-
- 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_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 1;
- }
-
- 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 = 1;
- }
- #else
- errno = 0;
-
- v2 = ptrace(PTRACE_PEEKDATA, child, (void *) &v1, 0);
-
- if (errno) {
- ret = 1;
- }
- #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])
- ])
- 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])
- ])
- 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_ERROR([FPM Trace - ptrace, pread, or mach: could not be found])
- fi
-
-])
-dnl }}}
-
-dnl configure options {{{
-AC_DEFUN([AC_FPM_ARGS],
-[
- PHP_ARG_WITH(fpm-bin,,
- [ --with-fpm-bin[=PATH] Set the path for php-fpm binary. (default: /usr/local/bin/php-fpm)], /usr/local/bin/php-fpm, no)
-
- PHP_ARG_WITH(fpm-conf,,
- [ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file. (default: /etc/php-fpm.conf)], /etc/php-fpm.conf, no)
-
- PHP_ARG_WITH(fpm-log,,
- [ --with-fpm-log[=PATH] Set the path for php-fpm log file. (default: /var/log/php-fpm.log)], /var/log/php-fpm.log, no)
-
- PHP_ARG_WITH(fpm-pid,,
- [ --with-fpm-pid[=PATH] Set the path for php-fpm pid file. (default: /var/run/php-fpm.pid)], /var/run/php-fpm.pid, no)
-
- 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)
-])
-
-AC_DEFUN([AC_FPM_VARS],
-[
- if test -z "$PHP_FPM_BIN" -o "$with_fpm_bin" = "yes" -o "$with_fpm_bin" = "no"; then
- php_fpm_bin_path="$fpm_prefix/bin/php-fpm"
- else
- php_fpm_bin_path="$PHP_FPM_BIN"
- fi
- php_fpm_bin=`basename $php_fpm_bin_path`
-
- if test -z "$PHP_FPM_CONF" -o "$with_fpm_conf" = "yes" -o "$with_fpm_conf" = "no"; then
- php_fpm_conf_path="/etc/php-fpm.conf"
- else
- php_fpm_conf_path="$PHP_FPM_CONF"
- fi
- php_fpm_conf=`basename $php_fpm_conf_path`
-
- if test -z "$PHP_FPM_LOG" -o "$with_fpm_log" = "yes" -o "$with_fpm_log" = "no"; then
- php_fpm_log_path="/var/log/php-fpm.log"
- else
- php_fpm_log_path="$PHP_FPM_LOG"
- fi
-
- if test -z "$PHP_FPM_PID" -o "$with_fpm_pid" = "yes" -o "$with_fpm_pid" = "no"; then
- php_fpm_pid_path="/var/run/php-fpm.pid"
- else
- php_fpm_pid_path="$PHP_FPM_PID"
- fi
-
- if test -z "$PHP_FPM_USER" -o "$with_fpm_user" = "yes" -o "$with_fpm_user" = "no"; then
- php_fpm_user="nobody"
- else
- php_fpm_user="$PHP_FPM_USER"
- fi
-
- if test -z "$PHP_FPM_GROUP" -o "$with_fpm_group" = "yes" -o "$with_fpm_group" = "no"; then
- php_fpm_group="nobody"
- else
- php_fpm_group="$PHP_FPM_GROUP"
- fi
-
-
- PHP_SUBST_OLD(fpm_version)
- PHP_SUBST_OLD(php_fpm_bin)
- PHP_SUBST_OLD(php_fpm_bin_path)
- PHP_SUBST_OLD(php_fpm_conf_path)
- PHP_SUBST_OLD(php_fpm_log_path)
- PHP_SUBST_OLD(php_fpm_pid_path)
- PHP_SUBST_OLD(php_fpm_user)
- PHP_SUBST_OLD(php_fpm_group)
-
-
- AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
- AC_DEFINE_UNQUOTED(PHP_FPM_BIN, "$php_fpm_bin", [fpm binary executable])
- AC_DEFINE_UNQUOTED(PHP_FPM_BIN_PATH, "$php_fpm_bin_path", [fpm bin file path])
- AC_DEFINE_UNQUOTED(PHP_FPM_CONF_PATH, "$php_fpm_conf_path", [fpm conf file path])
- AC_DEFINE_UNQUOTED(PHP_FPM_LOG_PATH, "$php_fpm_log_path", [fpm log file path])
- AC_DEFINE_UNQUOTED(PHP_FPM_PID_PATH, "$php_fpm_pid_path", [fpm pid file path])
- AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
- AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
-
-])
-
-
-AC_DEFUN([AC_FPM_OUTPUT],
-[
- PHP_OUTPUT(sapi/fpm/conf/$php_fpm_conf:sapi/fpm/conf/php-fpm.conf.in)
- PHP_OUTPUT(sapi/fpm/conf/init.d.$php_fpm_bin:sapi/fpm/conf/init.d.php-fpm.in)
- PHP_OUTPUT(sapi/fpm/conf/nginx-site-conf.sample:sapi/fpm/conf/nginx-site-conf.sample.in)
- PHP_OUTPUT(sapi/fpm/$php_fpm_bin.1:sapi/fpm/man/php-fpm.1.in)
-])
-
-
-AC_DEFUN([AC_FPM_CONF],
-[
- AC_FPM_ARGS
- AC_FPM_VARS
- AC_FPM_OUTPUT
-])
-dnl }}}
-
-
-AC_MSG_CHECKING(for FPM build)
-if test "$PHP_FPM" != "no"; then
- AC_MSG_RESULT($PHP_FPM)
-
- AC_LIB_EVENT([$minimum_libevent_version])
-
- AC_CACHE_CHECK(whether libevent build works, php_cv_libevent_build_works, [
- PHP_TEST_BUILD(event_init,
- [
- php_cv_libevent_build_works=yes
- ], [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([build test failed. Please check the config.log for details.])
- ], $LIBEVENT_LIBS)
- ])
-
- PHP_SETUP_LIBXML(FPM_SHARED_LIBADD, [
- ], [
- AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
- ])
-
- AC_FPM_CHECKS
- AC_FPM_CONF
-
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/Makefile.frag)
-
- SAPI_FPM_PATH=sapi/fpm/$php_fpm_bin
- PHP_SUBST(SAPI_FPM_PATH)
-
- mkdir -p sapi/fpm/fpm
- PHP_FPM_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name *.c -not -name fpm_trace*.c \) -exec printf "{} " \;`
-
- if test "$fpm_trace_type" ; then
- PHP_FPM_TRACE_FILES=`cd $abs_srcdir/sapi/fpm && find fpm/ \( -name fpm_trace.c -or -name fpm_trace_$fpm_trace_type.c \) -exec printf "{} " \;`
- fi
-
- PHP_FPM_CFLAGS="$LIBEVENT_CFLAGS -I$abs_srcdir/sapi/fpm"
-
- SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
- PHP_SUBST(SAPI_EXTRA_LIBS)
-
- INSTALL_IT="@echo \"Installing PHP FPM binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_FPM_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-fpm\$(program_suffix)\$(EXEEXT); echo \"Installing PHP FPM man page: \$(INSTALL_ROOT)\$(mandir)/man1/\"; \$(mkinstalldirs) \$(INSTALL_ROOT)\$(mandir)/man1; \$(INSTALL_DATA) \$(builddir)/sapi/fpm/php-fpm.1 \$(INSTALL_ROOT)\$(mandir)/man1/\$(program_prefix)php-fpm\$(program_suffix).1"
- 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_SAPI_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_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_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_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_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_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
- ;;
- esac
-
- PHP_SUBST(BUILD_FPM)
-else
- AC_MSG_RESULT(no)
-fi
diff --git a/sapi/fpm/fpm/fastcgi.c b/sapi/fpm/fpm/fastcgi.c
deleted file mode 100644
index 3f0adf9..0000000
--- a/sapi/fpm/fpm/fastcgi.c
+++ /dev/null
@@ -1,1298 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2009 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Dmitry Stogov <dmitry@zend.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: fastcgi.c 287777 2009-08-26 19:17:32Z pajoye $ */
-
-#include "php.h"
-#include "fastcgi.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-
-#ifdef _WIN32
-
-#include <windows.h>
-
- typedef unsigned int in_addr_t;
-
- struct sockaddr_un {
- short sun_family;
- char sun_path[MAXPATHLEN];
- };
-
- static HANDLE fcgi_accept_mutex = INVALID_HANDLE_VALUE;
- static int is_impersonate = 0;
-
-#define FCGI_LOCK(fd) \
- if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
- DWORD ret; \
- while ((ret = WaitForSingleObject(fcgi_accept_mutex, 1000)) == WAIT_TIMEOUT) { \
- if (in_shutdown) return -1; \
- } \
- if (ret == WAIT_FAILED) { \
- fprintf(stderr, "WaitForSingleObject() failed\n"); \
- return -1; \
- } \
- }
-
-#define FCGI_UNLOCK(fd) \
- if (fcgi_accept_mutex != INVALID_HANDLE_VALUE) { \
- ReleaseMutex(fcgi_accept_mutex); \
- }
-
-#else
-
-# include <sys/types.h>
-# include <sys/stat.h>
-# include <unistd.h>
-# include <fcntl.h>
-# include <sys/socket.h>
-# include <sys/un.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-# include <signal.h>
-
-# define closesocket(s) close(s)
-
-# if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
-# include <sys/poll.h>
-# endif
-# if defined(HAVE_SYS_SELECT_H)
-# include <sys/select.h>
-# endif
-
-#ifndef INADDR_NONE
-#define INADDR_NONE ((unsigned long) -1)
-#endif
-
-# ifndef HAVE_SOCKLEN_T
- typedef unsigned int socklen_t;
-# endif
-
-# ifdef USE_LOCKING
-# define FCGI_LOCK(fd) \
- do { \
- struct flock lock; \
- lock.l_type = F_WRLCK; \
- lock.l_start = 0; \
- lock.l_whence = SEEK_SET; \
- lock.l_len = 0; \
- if (fcntl(fd, F_SETLKW, &lock) != -1) { \
- break; \
- } else if (errno != EINTR || in_shutdown) { \
- return -1; \
- } \
- } while (1)
-
-# define FCGI_UNLOCK(fd) \
- do { \
- int orig_errno = errno; \
- while (1) { \
- struct flock lock; \
- lock.l_type = F_UNLCK; \
- lock.l_start = 0; \
- lock.l_whence = SEEK_SET; \
- lock.l_len = 0; \
- if (fcntl(fd, F_SETLK, &lock) != -1) { \
- break; \
- } else if (errno != EINTR) { \
- return -1; \
- } \
- } \
- errno = orig_errno; \
- } while (0)
-# else
-# define FCGI_LOCK(fd)
-# define FCGI_UNLOCK(fd)
-# endif
-
-#endif
-
-typedef union _sa_t {
- struct sockaddr sa;
- struct sockaddr_un sa_unix;
- struct sockaddr_in sa_inet;
-} sa_t;
-
-static HashTable fcgi_mgmt_vars;
-
-static int is_initialized = 0;
-static int is_fastcgi = 0;
-static int in_shutdown = 0;
-static in_addr_t *allowed_clients = NULL;
-
-#ifdef _WIN32
-
-static DWORD WINAPI fcgi_shutdown_thread(LPVOID arg)
-{
- HANDLE shutdown_event = (HANDLE) arg;
- WaitForSingleObject(shutdown_event, INFINITE);
- in_shutdown = 1;
- return 0;
-}
-
-#else
-
-static void fcgi_signal_handler(int signo)
-{
- if (signo == SIGUSR1 || signo == SIGTERM) {
- in_shutdown = 1;
- }
-}
-
-static void fcgi_setup_signals(void)
-{
- struct sigaction new_sa, old_sa;
-
- sigemptyset(&new_sa.sa_mask);
- new_sa.sa_flags = 0;
- new_sa.sa_handler = fcgi_signal_handler;
- sigaction(SIGUSR1, &new_sa, NULL);
- sigaction(SIGTERM, &new_sa, NULL);
- sigaction(SIGPIPE, NULL, &old_sa);
- if (old_sa.sa_handler == SIG_DFL) {
- sigaction(SIGPIPE, &new_sa, NULL);
- }
-}
-#endif
-
-int fcgi_in_shutdown(void)
-{
- return in_shutdown;
-}
-
-int fcgi_init(void)
-{
- if (!is_initialized) {
-#ifndef _WIN32
- sa_t sa;
- socklen_t len = sizeof(sa);
-#endif
- zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb, 1);
- fcgi_set_mgmt_var("FCGI_MPXS_CONNS", sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
-
- is_initialized = 1;
-#ifdef _WIN32
-# if 0
- /* TODO: Support for TCP sockets */
- WSADATA wsaData;
-
- if (WSAStartup(MAKEWORD(2,0), &wsaData)) {
- fprintf(stderr, "Error starting Windows Sockets. Error: %d", WSAGetLastError());
- return 0;
- }
-# endif
- if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
- (GetStdHandle(STD_ERROR_HANDLE) == INVALID_HANDLE_VALUE) &&
- (GetStdHandle(STD_INPUT_HANDLE) != INVALID_HANDLE_VALUE)) {
- char *str;
- DWORD pipe_mode = PIPE_READMODE_BYTE | PIPE_WAIT;
- HANDLE pipe = GetStdHandle(STD_INPUT_HANDLE);
-
- SetNamedPipeHandleState(pipe, &pipe_mode, NULL, NULL);
-
- str = getenv("_FCGI_SHUTDOWN_EVENT_");
- if (str != NULL) {
- HANDLE shutdown_event = (HANDLE) atoi(str);
- if (!CreateThread(NULL, 0, fcgi_shutdown_thread,
- shutdown_event, 0, NULL)) {
- return -1;
- }
- }
- str = getenv("_FCGI_MUTEX_");
- if (str != NULL) {
- fcgi_accept_mutex = (HANDLE) atoi(str);
- }
- return is_fastcgi = 1;
- } else {
- return is_fastcgi = 0;
- }
-#else
- errno = 0;
- if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno == ENOTCONN) {
- fcgi_setup_signals();
- return is_fastcgi = 1;
- } else {
- return is_fastcgi = 0;
- }
-#endif
- }
- return is_fastcgi;
-}
-
-
-int fcgi_is_fastcgi(void)
-{
- if (!is_initialized) {
- return fcgi_init();
- } else {
- return is_fastcgi;
- }
-}
-
-void fcgi_set_in_shutdown(int new_value)
-{
- in_shutdown = new_value;
-}
-
-void fcgi_shutdown(void)
-{
- if (is_initialized) {
- zend_hash_destroy(&fcgi_mgmt_vars);
- }
- is_fastcgi = 0;
-}
-
-#ifdef _WIN32
-/* Do some black magic with the NT security API.
- * We prepare a DACL (Discretionary Access Control List) so that
- * we, the creator, are allowed all access, while "Everyone Else"
- * is only allowed to read and write to the pipe.
- * This avoids security issues on shared hosts where a luser messes
- * with the lower-level pipe settings and screws up the FastCGI service.
- */
-static PACL prepare_named_pipe_acl(PSECURITY_DESCRIPTOR sd, LPSECURITY_ATTRIBUTES sa)
-{
- DWORD req_acl_size;
- char everyone_buf[32], owner_buf[32];
- PSID sid_everyone, sid_owner;
- SID_IDENTIFIER_AUTHORITY
- siaWorld = SECURITY_WORLD_SID_AUTHORITY,
- siaCreator = SECURITY_CREATOR_SID_AUTHORITY;
- PACL acl;
-
- sid_everyone = (PSID)&everyone_buf;
- sid_owner = (PSID)&owner_buf;
-
- req_acl_size = sizeof(ACL) +
- (2 * ((sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD)) + GetSidLengthRequired(1)));
-
- acl = malloc(req_acl_size);
-
- if (acl == NULL) {
- return NULL;
- }
-
- if (!InitializeSid(sid_everyone, &siaWorld, 1)) {
- goto out_fail;
- }
- *GetSidSubAuthority(sid_everyone, 0) = SECURITY_WORLD_RID;
-
- if (!InitializeSid(sid_owner, &siaCreator, 1)) {
- goto out_fail;
- }
- *GetSidSubAuthority(sid_owner, 0) = SECURITY_CREATOR_OWNER_RID;
-
- if (!InitializeAcl(acl, req_acl_size, ACL_REVISION)) {
- goto out_fail;
- }
-
- if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_GENERIC_READ | FILE_GENERIC_WRITE, sid_everyone)) {
- goto out_fail;
- }
-
- if (!AddAccessAllowedAce(acl, ACL_REVISION, FILE_ALL_ACCESS, sid_owner)) {
- goto out_fail;
- }
-
- if (!InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION)) {
- goto out_fail;
- }
-
- if (!SetSecurityDescriptorDacl(sd, TRUE, acl, FALSE)) {
- goto out_fail;
- }
-
- sa->lpSecurityDescriptor = sd;
-
- return acl;
-
-out_fail:
- free(acl);
- return NULL;
-}
-#endif
-
-void fcgi_set_allowed_clients(char *ip)
-{
- char *cur, *end;
- int n;
-
- if (ip) {
- ip = strdup(ip);
- cur = ip;
- n = 0;
- while (*cur) {
- if (*cur == ',') n++;
- cur++;
- }
- if (allowed_clients) free(allowed_clients);
- allowed_clients = malloc(sizeof(in_addr_t) * (n+2));
- n = 0;
- cur = ip;
- while (cur) {
- end = strchr(cur, ',');
- if (end) {
- *end = 0;
- end++;
- }
- allowed_clients[n] = inet_addr(cur);
- if (allowed_clients[n] == INADDR_NONE) {
- fprintf(stderr, "Wrong IP address '%s' in FCGI_WEB_SERVER_ADDRS\n", cur);
- }
- n++;
- cur = end;
- }
- allowed_clients[n] = INADDR_NONE;
- free(ip);
- }
-}
-
-static int is_port_number(const char *bindpath)
-{
- while (*bindpath) {
- if (*bindpath < '0' || *bindpath > '9') {
- return 0;
- }
- bindpath++;
- }
- return 1;
-}
-
-int fcgi_listen(const char *path, int backlog)
-{
- char *s;
- int tcp = 0;
- char host[MAXPATHLEN];
- short port = 0;
- int listen_socket;
- sa_t sa;
- socklen_t sock_len;
-#ifdef SO_REUSEADDR
-# ifdef _WIN32
- BOOL reuse = 1;
-# else
- int reuse = 1;
-# endif
-#endif
-
- if ((s = strchr(path, ':'))) {
- port = atoi(s+1);
- if (port != 0 && (s-path) < MAXPATHLEN) {
- strncpy(host, path, s-path);
- host[s-path] = '\0';
- tcp = 1;
- }
- } else if (is_port_number(path)) {
- port = atoi(path);
- if (port != 0) {
- host[0] = '\0';
- tcp = 1;
- }
- }
-
- /* Prepare socket address */
- if (tcp) {
- memset(&sa.sa_inet, 0, sizeof(sa.sa_inet));
- sa.sa_inet.sin_family = AF_INET;
- sa.sa_inet.sin_port = htons(port);
- sock_len = sizeof(sa.sa_inet);
-
- if (!*host || !strncmp(host, "*", sizeof("*")-1)) {
- sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY);
- } else {
- sa.sa_inet.sin_addr.s_addr = inet_addr(host);
- if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) {
- struct hostent *hep;
-
- hep = gethostbyname(host);
- if (!hep || hep->h_addrtype != AF_INET || !hep->h_addr_list[0]) {
- fprintf(stderr, "Cannot resolve host name '%s'!\n", host);
- return -1;
- } else if (hep->h_addr_list[1]) {
- fprintf(stderr, "Host '%s' has multiple addresses. You must choose one explicitly!\n", host);
- return -1;
- }
- sa.sa_inet.sin_addr.s_addr = ((struct in_addr*)hep->h_addr_list[0])->s_addr;
- }
- }
- } else {
-#ifdef _WIN32
- SECURITY_DESCRIPTOR sd;
- SECURITY_ATTRIBUTES saw;
- PACL acl;
- HANDLE namedPipe;
-
- memset(&sa, 0, sizeof(saw));
- saw.nLength = sizeof(saw);
- saw.bInheritHandle = FALSE;
- acl = prepare_named_pipe_acl(&sd, &saw);
-
- namedPipe = CreateNamedPipe(path,
- PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
- PIPE_TYPE_BYTE | PIPE_WAIT | PIPE_READMODE_BYTE,
- PIPE_UNLIMITED_INSTANCES,
- 8192, 8192, 0, &saw);
- if (namedPipe == INVALID_HANDLE_VALUE) {
- return -1;
- }
- listen_socket = _open_osfhandle((long)namedPipe, 0);
- if (!is_initialized) {
- fcgi_init();
- }
- is_fastcgi = 1;
- return listen_socket;
-
-#else
- int path_len = strlen(path);
-
- if (path_len >= sizeof(sa.sa_unix.sun_path)) {
- fprintf(stderr, "Listening socket's path name is too long.\n");
- return -1;
- }
-
- memset(&sa.sa_unix, 0, sizeof(sa.sa_unix));
- sa.sa_unix.sun_family = AF_UNIX;
- memcpy(sa.sa_unix.sun_path, path, path_len + 1);
- sock_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len;
-#ifdef HAVE_SOCKADDR_UN_SUN_LEN
- sa.sa_unix.sun_len = sock_len;
-#endif
- unlink(path);
-#endif
- }
-
- /* Create, bind socket and start listen on it */
- if ((listen_socket = socket(sa.sa.sa_family, SOCK_STREAM, 0)) < 0 ||
-#ifdef SO_REUSEADDR
- setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, (char*)&reuse, sizeof(reuse)) < 0 ||
-#endif
- bind(listen_socket, (struct sockaddr *) &sa, sock_len) < 0 ||
- listen(listen_socket, backlog) < 0) {
-
- fprintf(stderr, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno));
- return -1;
- }
-
- if (!tcp) {
- chmod(path, 0777);
- } else {
- fcgi_set_allowed_clients(getenv("FCGI_WEB_SERVER_ADDRS"));
- }
-
- if (!is_initialized) {
- fcgi_init();
- }
- is_fastcgi = 1;
-
-#ifdef _WIN32
- if (tcp) {
- listen_socket = _open_osfhandle((long)listen_socket, 0);
- }
-#else
- fcgi_setup_signals();
-#endif
- return listen_socket;
-}
-
-void fcgi_init_request(fcgi_request *req, int listen_socket)
-{
- memset(req, 0, sizeof(fcgi_request));
- req->listen_socket = listen_socket;
- req->fd = -1;
- req->id = -1;
-
- req->in_len = 0;
- req->in_pad = 0;
-
- req->out_hdr = NULL;
- req->out_pos = req->out_buf;
-
-#ifdef _WIN32
- req->tcp = !GetNamedPipeInfo((HANDLE)_get_osfhandle(req->listen_socket), NULL, NULL, NULL, NULL);
-#endif
-}
-
-static inline ssize_t safe_write(fcgi_request *req, const void *buf, size_t count)
-{
- int ret;
- size_t n = 0;
-
- do {
- errno = 0;
-#ifdef _WIN32
- if (!req->tcp) {
- ret = write(req->fd, ((char*)buf)+n, count-n);
- } else {
- ret = send(req->fd, ((char*)buf)+n, count-n, 0);
- if (ret <= 0) {
- errno = WSAGetLastError();
- }
- }
-#else
- ret = write(req->fd, ((char*)buf)+n, count-n);
-#endif
- if (ret > 0) {
- n += ret;
- } else if (ret <= 0 && errno != 0 && errno != EINTR) {
- return ret;
- }
- } while (n != count);
- return n;
-}
-
-static inline ssize_t safe_read(fcgi_request *req, const void *buf, size_t count)
-{
- int ret;
- size_t n = 0;
-
- do {
- errno = 0;
-#ifdef _WIN32
- if (!req->tcp) {
- ret = read(req->fd, ((char*)buf)+n, count-n);
- } else {
- ret = recv(req->fd, ((char*)buf)+n, count-n, 0);
- if (ret <= 0) {
- errno = WSAGetLastError();
- }
- }
-#else
- ret = read(req->fd, ((char*)buf)+n, count-n);
-#endif
- if (ret > 0) {
- n += ret;
- } else if (ret == 0 && errno == 0) {
- return n;
- } else if (ret <= 0 && errno != 0 && errno != EINTR) {
- return ret;
- }
- } while (n != count);
- return n;
-}
-
-static inline int fcgi_make_header(fcgi_header *hdr, fcgi_request_type type, int req_id, int len)
-{
- int pad = ((len + 7) & ~7) - len;
-
- hdr->contentLengthB0 = (unsigned char)(len & 0xff);
- hdr->contentLengthB1 = (unsigned char)((len >> 8) & 0xff);
- hdr->paddingLength = (unsigned char)pad;
- hdr->requestIdB0 = (unsigned char)(req_id & 0xff);
- hdr->requestIdB1 = (unsigned char)((req_id >> 8) & 0xff);
- hdr->reserved = 0;
- hdr->type = type;
- hdr->version = FCGI_VERSION_1;
- if (pad) {
- memset(((unsigned char*)hdr) + sizeof(fcgi_header) + len, 0, pad);
- }
- return pad;
-}
-
-static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *end)
-{
- char buf[128];
- char *tmp = buf;
- int buf_size = sizeof(buf);
- int name_len, val_len;
- char *s;
- int ret = 1;
-
- while (p < end) {
- name_len = *p++;
- if (name_len >= 128) {
- name_len = ((name_len & 0x7f) << 24);
- name_len |= (*p++ << 16);
- name_len |= (*p++ << 8);
- name_len |= *p++;
- }
- val_len = *p++;
- if (val_len >= 128) {
- val_len = ((val_len & 0x7f) << 24);
- val_len |= (*p++ << 16);
- val_len |= (*p++ << 8);
- val_len |= *p++;
- }
- if (name_len + val_len < 0 ||
- name_len + val_len > end - p) {
- /* Malformated request */
- ret = 0;
- break;
- }
- if (name_len+1 >= buf_size) {
- buf_size = name_len + 64;
- tmp = (tmp == buf ? emalloc(buf_size): erealloc(tmp, buf_size));
- }
- memcpy(tmp, p, name_len);
- tmp[name_len] = 0;
- s = estrndup((char*)p + name_len, val_len);
- zend_hash_update(req->env, tmp, name_len+1, &s, sizeof(char*), NULL);
- p += name_len + val_len;
- }
- if (tmp != buf && tmp != NULL) {
- efree(tmp);
- }
- return ret;
-}
-
-static void fcgi_free_var(char **s)
-{
- efree(*s);
-}
-
-static int fcgi_read_request(fcgi_request *req)
-{
- fcgi_header hdr;
- int len, padding;
- unsigned char buf[FCGI_MAX_LENGTH+8];
-
- req->keep = 0;
- req->closed = 0;
- req->in_len = 0;
- req->out_hdr = NULL;
- req->out_pos = req->out_buf;
- ALLOC_HASHTABLE(req->env);
- zend_hash_init(req->env, 0, NULL, (void (*)(void *)) fcgi_free_var, 0);
-
- if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
- hdr.version < FCGI_VERSION_1) {
- return 0;
- }
-
- len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
- padding = hdr.paddingLength;
-
- while (hdr.type == FCGI_STDIN && len == 0) {
- if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
- hdr.version < FCGI_VERSION_1) {
- return 0;
- }
-
- len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
- padding = hdr.paddingLength;
- }
-
- if (len + padding > FCGI_MAX_LENGTH) {
- return 0;
- }
-
- req->id = (hdr.requestIdB1 << 8) + hdr.requestIdB0;
-
- if (hdr.type == FCGI_BEGIN_REQUEST && len == sizeof(fcgi_begin_request)) {
- char *val;
-
- if (safe_read(req, buf, len+padding) != len+padding) {
- return 0;
- }
-
- req->keep = (((fcgi_begin_request*)buf)->flags & FCGI_KEEP_CONN);
- switch ((((fcgi_begin_request*)buf)->roleB1 << 8) + ((fcgi_begin_request*)buf)->roleB0) {
- case FCGI_RESPONDER:
- val = estrdup("RESPONDER");
- zend_hash_update(req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
- break;
- case FCGI_AUTHORIZER:
- val = estrdup("AUTHORIZER");
- zend_hash_update(req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
- break;
- case FCGI_FILTER:
- val = estrdup("FILTER");
- zend_hash_update(req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
- break;
- default:
- return 0;
- }
-
- if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
- hdr.version < FCGI_VERSION_1) {
- return 0;
- }
-
- len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
- padding = hdr.paddingLength;
-
- while (hdr.type == FCGI_PARAMS && len > 0) {
- if (len + padding > FCGI_MAX_LENGTH) {
- return 0;
- }
-
- if (safe_read(req, buf, len+padding) != len+padding) {
- req->keep = 0;
- return 0;
- }
-
- if (!fcgi_get_params(req, buf, buf+len)) {
- req->keep = 0;
- return 0;
- }
-
- if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
- hdr.version < FCGI_VERSION_1) {
- req->keep = 0;
- return 0;
- }
- len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
- padding = hdr.paddingLength;
- }
- } else if (hdr.type == FCGI_GET_VALUES) {
- unsigned char *p = buf + sizeof(fcgi_header);
- HashPosition pos;
- char * str_index;
- uint str_length;
- ulong num_index;
- int key_type;
- zval ** value;
-
- if (safe_read(req, buf, len+padding) != len+padding) {
- req->keep = 0;
- return 0;
- }
-
- if (!fcgi_get_params(req, buf, buf+len)) {
- req->keep = 0;
- return 0;
- }
-
- zend_hash_internal_pointer_reset_ex(req->env, &pos);
- while ((key_type = zend_hash_get_current_key_ex(req->env, &str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
- int zlen;
- zend_hash_move_forward_ex(req->env, &pos);
- if (key_type != HASH_KEY_IS_STRING) {
- continue;
- }
- if (zend_hash_find(&fcgi_mgmt_vars, str_index, str_length, (void**) &value) != SUCCESS) {
- continue;
- }
- --str_length;
- zlen = Z_STRLEN_PP(value);
- if ((p + 4 + 4 + str_length + zlen) >= (buf + sizeof(buf))) {
- break;
- }
- if (str_length < 0x80) {
- *p++ = str_length;
- } else {
- *p++ = ((str_length >> 24) & 0xff) | 0x80;
- *p++ = (str_length >> 16) & 0xff;
- *p++ = (str_length >> 8) & 0xff;
- *p++ = str_length & 0xff;
- }
- if (zlen < 0x80) {
- *p++ = zlen;
- } else {
- *p++ = ((zlen >> 24) & 0xff) | 0x80;
- *p++ = (zlen >> 16) & 0xff;
- *p++ = (zlen >> 8) & 0xff;
- *p++ = zlen & 0xff;
- }
- memcpy(p, str_index, str_length);
- p += str_length;
- memcpy(p, Z_STRVAL_PP(value), zlen);
- p += zlen;
- }
- len = p - buf - sizeof(fcgi_header);
- len += fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, 0, len);
- if (safe_write(req, buf, sizeof(fcgi_header)+len) != (int)sizeof(fcgi_header)+len) {
- req->keep = 0;
- return 0;
- }
- return 0;
- } else {
- return 0;
- }
-
- return 1;
-}
-
-int fcgi_read(fcgi_request *req, char *str, int len)
-{
- int ret, n, rest;
- fcgi_header hdr;
- unsigned char buf[255];
-
- n = 0;
- rest = len;
- while (rest > 0) {
- if (req->in_len == 0) {
- if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
- hdr.version < FCGI_VERSION_1 ||
- hdr.type != FCGI_STDIN) {
- req->keep = 0;
- return 0;
- }
- req->in_len = (hdr.contentLengthB1 << 8) | hdr.contentLengthB0;
- req->in_pad = hdr.paddingLength;
- if (req->in_len == 0) {
- return n;
- }
- }
-
- if (req->in_len >= rest) {
- ret = safe_read(req, str, rest);
- } else {
- ret = safe_read(req, str, req->in_len);
- }
- if (ret < 0) {
- req->keep = 0;
- return ret;
- } else if (ret > 0) {
- req->in_len -= ret;
- rest -= ret;
- n += ret;
- str += ret;
- if (req->in_len == 0) {
- if (req->in_pad) {
- if (safe_read(req, buf, req->in_pad) != req->in_pad) {
- req->keep = 0;
- return ret;
- }
- }
- } else {
- return n;
- }
- } else {
- return n;
- }
- }
- return n;
-}
-
-static inline void fcgi_close(fcgi_request *req, int force, int destroy)
-{
- if (destroy && req->env) {
- zend_hash_destroy(req->env);
- FREE_HASHTABLE(req->env);
- req->env = NULL;
- }
-
-#ifdef _WIN32
- if (is_impersonate && !req->tcp) {
- RevertToSelf();
- }
-#endif
-
- if ((force || !req->keep) && req->fd >= 0) {
-#ifdef _WIN32
- if (!req->tcp) {
- HANDLE pipe = (HANDLE)_get_osfhandle(req->fd);
-
- if (!force) {
- FlushFileBuffers(pipe);
- }
- DisconnectNamedPipe(pipe);
- } else {
- if (!force) {
- char buf[8];
-
- shutdown(req->fd, 1);
- while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
- }
- closesocket(req->fd);
- }
-#else
- if (!force) {
- char buf[8];
-
- shutdown(req->fd, 1);
- while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
- }
- close(req->fd);
-#endif
- req->fd = -1;
- }
-}
-
-int fcgi_accept_request(fcgi_request *req)
-{
-#ifdef _WIN32
- HANDLE pipe;
- OVERLAPPED ov;
-#endif
-
- while (1) {
- if (req->fd < 0) {
- while (1) {
- if (in_shutdown) {
- return -1;
- }
-#ifdef _WIN32
- if (!req->tcp) {
- pipe = (HANDLE)_get_osfhandle(req->listen_socket);
- FCGI_LOCK(req->listen_socket);
- ov.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
- if (!ConnectNamedPipe(pipe, &ov)) {
- errno = GetLastError();
- if (errno == ERROR_IO_PENDING) {
- while (WaitForSingleObject(ov.hEvent, 1000) == WAIT_TIMEOUT) {
- if (in_shutdown) {
- CloseHandle(ov.hEvent);
- FCGI_UNLOCK(req->listen_socket);
- return -1;
- }
- }
- } else if (errno != ERROR_PIPE_CONNECTED) {
- }
- }
- CloseHandle(ov.hEvent);
- req->fd = req->listen_socket;
- FCGI_UNLOCK(req->listen_socket);
- } else {
- SOCKET listen_socket = (SOCKET)_get_osfhandle(req->listen_socket);
-#else
- {
- int listen_socket = req->listen_socket;
-#endif
- sa_t sa;
- socklen_t len = sizeof(sa);
-
- FCGI_LOCK(req->listen_socket);
- req->fd = accept(listen_socket, (struct sockaddr *)&sa, &len);
- FCGI_UNLOCK(req->listen_socket);
- if (req->fd >= 0 && allowed_clients) {
- int n = 0;
- int allowed = 0;
-
- while (allowed_clients[n] != INADDR_NONE) {
- if (allowed_clients[n] == sa.sa_inet.sin_addr.s_addr) {
- allowed = 1;
- break;
- }
- n++;
- }
- if (!allowed) {
- fprintf(stderr, "Connection from disallowed IP address '%s' is dropped.\n", inet_ntoa(sa.sa_inet.sin_addr));
- closesocket(req->fd);
- req->fd = -1;
- continue;
- }
- }
- }
-
-#ifdef _WIN32
- if (req->fd < 0 && (in_shutdown || errno != EINTR)) {
-#else
- if (req->fd < 0 && (in_shutdown || (errno != EINTR && errno != ECONNABORTED))) {
-#endif
- return -1;
- }
-
-#ifdef _WIN32
- break;
-#else
- if (req->fd >= 0) {
-#if defined(HAVE_SYS_POLL_H) && defined(HAVE_POLL)
- struct pollfd fds;
- int ret;
-
- fds.fd = req->fd;
- fds.events = POLLIN;
- fds.revents = 0;
- do {
- errno = 0;
- ret = poll(&fds, 1, 5000);
- } while (ret < 0 && errno == EINTR);
- if (ret > 0 && (fds.revents & POLLIN)) {
- break;
- }
- fcgi_close(req, 1, 0);
-#else
- if (req->fd < FD_SETSIZE) {
- struct timeval tv = {5,0};
- fd_set set;
- int ret;
-
- FD_ZERO(&set);
- FD_SET(req->fd, &set);
- do {
- errno = 0;
- ret = select(req->fd + 1, &set, NULL, NULL, &tv) >= 0;
- } while (ret < 0 && errno == EINTR);
- if (ret > 0 && FD_ISSET(req->fd, &set)) {
- break;
- }
- fcgi_close(req, 1, 0);
- } else {
- fprintf(stderr, "Too many open file descriptors. FD_SETSIZE limit exceeded.");
- fcgi_close(req, 1, 0);
- }
-#endif
- }
-#endif
- }
- } else if (in_shutdown) {
- return -1;
- }
- if (fcgi_read_request(req)) {
-#ifdef _WIN32
- if (is_impersonate && !req->tcp) {
- pipe = (HANDLE)_get_osfhandle(req->fd);
- if (!ImpersonateNamedPipeClient(pipe)) {
- fcgi_close(req, 1, 1);
- continue;
- }
- }
-#endif
- return req->fd;
- } else {
- fcgi_close(req, 1, 1);
- }
- }
-}
-
-static inline fcgi_header* open_packet(fcgi_request *req, fcgi_request_type type)
-{
- req->out_hdr = (fcgi_header*) req->out_pos;
- req->out_hdr->type = type;
- req->out_pos += sizeof(fcgi_header);
- return req->out_hdr;
-}
-
-static inline void close_packet(fcgi_request *req)
-{
- if (req->out_hdr) {
- int len = req->out_pos - ((unsigned char*)req->out_hdr + sizeof(fcgi_header));
-
- req->out_pos += fcgi_make_header(req->out_hdr, (fcgi_request_type)req->out_hdr->type, req->id, len);
- req->out_hdr = NULL;
- }
-}
-
-int fcgi_flush(fcgi_request *req, int close)
-{
- int len;
-
- close_packet(req);
-
- len = req->out_pos - req->out_buf;
-
- if (close) {
- fcgi_end_request_rec *rec = (fcgi_end_request_rec*)(req->out_pos);
-
- fcgi_make_header(&rec->hdr, FCGI_END_REQUEST, req->id, sizeof(fcgi_end_request));
- rec->body.appStatusB3 = 0;
- rec->body.appStatusB2 = 0;
- rec->body.appStatusB1 = 0;
- rec->body.appStatusB0 = 0;
- rec->body.protocolStatus = FCGI_REQUEST_COMPLETE;
- len += sizeof(fcgi_end_request_rec);
- }
-
- if (safe_write(req, req->out_buf, len) != len) {
- req->keep = 0;
- return 0;
- }
-
- req->out_pos = req->out_buf;
- return 1;
-}
-
-int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len)
-{
- int limit, rest;
-
- if (len <= 0) {
- return 0;
- }
-
- if (req->out_hdr && req->out_hdr->type != type) {
- close_packet(req);
- }
-#if 0
- /* Unoptimized, but clear version */
- rest = len;
- while (rest > 0) {
- limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
-
- if (!req->out_hdr) {
- if (limit < sizeof(fcgi_header)) {
- if (!fcgi_flush(req, 0)) {
- return -1;
- }
- }
- open_packet(req, type);
- }
- limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
- if (rest < limit) {
- memcpy(req->out_pos, str, rest);
- req->out_pos += rest;
- return len;
- } else {
- memcpy(req->out_pos, str, limit);
- req->out_pos += limit;
- rest -= limit;
- str += limit;
- if (!fcgi_flush(req, 0)) {
- return -1;
- }
- }
- }
-#else
- /* Optimized version */
- limit = sizeof(req->out_buf) - (req->out_pos - req->out_buf);
- if (!req->out_hdr) {
- limit -= sizeof(fcgi_header);
- if (limit < 0) limit = 0;
- }
-
- if (len < limit) {
- if (!req->out_hdr) {
- open_packet(req, type);
- }
- memcpy(req->out_pos, str, len);
- req->out_pos += len;
- } else if (len - limit < sizeof(req->out_buf) - sizeof(fcgi_header)) {
- if (!req->out_hdr) {
- open_packet(req, type);
- }
- if (limit > 0) {
- memcpy(req->out_pos, str, limit);
- req->out_pos += limit;
- }
- if (!fcgi_flush(req, 0)) {
- return -1;
- }
- if (len > limit) {
- open_packet(req, type);
- memcpy(req->out_pos, str + limit, len - limit);
- req->out_pos += len - limit;
- }
- } else {
- int pos = 0;
- int pad;
-
- close_packet(req);
- while ((len - pos) > 0xffff) {
- open_packet(req, type);
- fcgi_make_header(req->out_hdr, type, req->id, 0xfff8);
- req->out_hdr = NULL;
- if (!fcgi_flush(req, 0)) {
- return -1;
- }
- if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
- req->keep = 0;
- return -1;
- }
- pos += 0xfff8;
- }
-
- pad = (((len - pos) + 7) & ~7) - (len - pos);
- rest = pad ? 8 - pad : 0;
-
- open_packet(req, type);
- fcgi_make_header(req->out_hdr, type, req->id, (len - pos) - rest);
- req->out_hdr = NULL;
- if (!fcgi_flush(req, 0)) {
- return -1;
- }
- if (safe_write(req, str + pos, (len - pos) - rest) != (len - pos) - rest) {
- req->keep = 0;
- return -1;
- }
- if (pad) {
- open_packet(req, type);
- memcpy(req->out_pos, str + len - rest, rest);
- req->out_pos += rest;
- }
- }
-#endif
- return len;
-}
-
-int fcgi_finish_request(fcgi_request *req, int force_close)
-{
- int ret = 1;
-
- if (req->fd >= 0) {
- if (!req->closed) {
- ret = fcgi_flush(req, 1);
- req->closed = 1;
- }
- fcgi_close(req, force_close, 1);
- }
- return ret;
-}
-
-char* fcgi_getenv(fcgi_request *req, const char* var, int var_len)
-{
- char **val;
-
- if (!req) return NULL;
-
- if (zend_hash_find(req->env, (char*)var, var_len+1, (void**)&val) == SUCCESS) {
- return *val;
- }
- return NULL;
-}
-
-char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val)
-{
- if (var && req) {
- if (val == NULL) {
- zend_hash_del(req->env, var, var_len+1);
- } else {
- char **ret;
-
- val = estrdup(val);
- if (zend_hash_update(req->env, var, var_len+1, &val, sizeof(char*), (void**)&ret) == SUCCESS) {
- return *ret;
- }
- }
- }
- return NULL;
-}
-
-#ifdef _WIN32
-void fcgi_impersonate(void)
-{
- char *os_name;
-
- os_name = getenv("OS");
- if (os_name && stricmp(os_name, "Windows_NT") == 0) {
- is_impersonate = 1;
- }
-}
-#endif
-
-void fcgi_set_mgmt_var(const char * name, size_t name_len, const char * value, size_t value_len)
-{
- zval * zvalue;
- zvalue = pemalloc(sizeof(*zvalue), 1);
- Z_TYPE_P(zvalue) = IS_STRING;
- Z_STRVAL_P(zvalue) = pestrndup(value, value_len, 1);
- Z_STRLEN_P(zvalue) = value_len;
- zend_hash_add(&fcgi_mgmt_vars, name, name_len + 1, &zvalue, sizeof(zvalue), NULL);
-}
-
-void fcgi_free_mgmt_var_cb(void * ptr)
-{
- zval ** var = (zval **)ptr;
- pefree(Z_STRVAL_PP(var), 1);
- pefree(*var, 1);
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/fpm/fpm/fastcgi.h b/sapi/fpm/fpm/fastcgi.h
deleted file mode 100644
index 8d09419..0000000
--- a/sapi/fpm/fpm/fastcgi.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2009 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Dmitry Stogov <dmitry@zend.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: fastcgi.h 272370 2008-12-31 11:15:49Z sebastian $ */
-
-/* FastCGI protocol */
-
-#define FCGI_VERSION_1 1
-
-#define FCGI_MAX_LENGTH 0xffff
-
-#define FCGI_KEEP_CONN 1
-
-typedef enum _fcgi_role {
- FCGI_RESPONDER = 1,
- FCGI_AUTHORIZER = 2,
- FCGI_FILTER = 3
-} fcgi_role;
-
-typedef enum _fcgi_request_type {
- FCGI_BEGIN_REQUEST = 1, /* [in] */
- FCGI_ABORT_REQUEST = 2, /* [in] (not supported) */
- FCGI_END_REQUEST = 3, /* [out] */
- FCGI_PARAMS = 4, /* [in] environment variables */
- FCGI_STDIN = 5, /* [in] post data */
- FCGI_STDOUT = 6, /* [out] response */
- FCGI_STDERR = 7, /* [out] errors */
- FCGI_DATA = 8, /* [in] filter data (not supported) */
- FCGI_GET_VALUES = 9, /* [in] */
- FCGI_GET_VALUES_RESULT = 10 /* [out] */
-} fcgi_request_type;
-
-typedef enum _fcgi_protocol_status {
- FCGI_REQUEST_COMPLETE = 0,
- FCGI_CANT_MPX_CONN = 1,
- FCGI_OVERLOADED = 2,
- FCGI_UNKNOWN_ROLE = 3
-} dcgi_protocol_status;
-
-typedef struct _fcgi_header {
- unsigned char version;
- unsigned char type;
- unsigned char requestIdB1;
- unsigned char requestIdB0;
- unsigned char contentLengthB1;
- unsigned char contentLengthB0;
- unsigned char paddingLength;
- unsigned char reserved;
-} fcgi_header;
-
-typedef struct _fcgi_begin_request {
- unsigned char roleB1;
- unsigned char roleB0;
- unsigned char flags;
- unsigned char reserved[5];
-} fcgi_begin_request;
-
-typedef struct _fcgi_begin_request_rec {
- fcgi_header hdr;
- fcgi_begin_request body;
-} fcgi_begin_request_rec;
-
-typedef struct _fcgi_end_request {
- unsigned char appStatusB3;
- unsigned char appStatusB2;
- unsigned char appStatusB1;
- unsigned char appStatusB0;
- unsigned char protocolStatus;
- unsigned char reserved[3];
-} fcgi_end_request;
-
-typedef struct _fcgi_end_request_rec {
- fcgi_header hdr;
- fcgi_end_request body;
-} fcgi_end_request_rec;
-
-/* FastCGI client API */
-
-typedef struct _fcgi_request {
- int listen_socket;
-#ifdef _WIN32
- int tcp;
-#endif
- int fd;
- int id;
- int keep;
- int closed;
-
- int in_len;
- int in_pad;
-
- fcgi_header *out_hdr;
- unsigned char *out_pos;
- unsigned char out_buf[1024*8];
- unsigned char reserved[sizeof(fcgi_end_request_rec)];
-
- HashTable *env;
-} fcgi_request;
-
-int fcgi_init(void);
-void fcgi_shutdown(void);
-int fcgi_is_fastcgi(void);
-int fcgi_in_shutdown(void);
-int fcgi_listen(const char *path, int backlog);
-void fcgi_init_request(fcgi_request *req, int listen_socket);
-int fcgi_accept_request(fcgi_request *req);
-int fcgi_finish_request(fcgi_request *req, int force_close);
-
-void fcgi_set_in_shutdown(int);
-void fcgi_set_allowed_clients(char *);
-
-char* fcgi_getenv(fcgi_request *req, const char* var, int var_len);
-char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val);
-
-int fcgi_read(fcgi_request *req, char *str, int len);
-
-int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int len);
-int fcgi_flush(fcgi_request *req, int close);
-
-#ifdef PHP_WIN32
-void fcgi_impersonate(void);
-#endif
-
-void fcgi_set_mgmt_var(const char * name, size_t name_len, const char * value, size_t value_len);
-void fcgi_free_mgmt_var_cb(void * ptr);
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c
deleted file mode 100644
index 510eb7f..0000000
--- a/sapi/fpm/fpm/fpm.c
+++ /dev/null
@@ -1,82 +0,0 @@
-
- /* $Id: fpm.c,v 1.23 2008/07/20 16:38:31 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <stdlib.h> /* for exit */
-
-#include "fpm.h"
-#include "fpm_children.h"
-#include "fpm_signals.h"
-#include "fpm_env.h"
-#include "fpm_events.h"
-#include "fpm_cleanup.h"
-#include "fpm_php.h"
-#include "fpm_sockets.h"
-#include "fpm_unix.h"
-#include "fpm_process_ctl.h"
-#include "fpm_conf.h"
-#include "fpm_worker_pool.h"
-#include "fpm_stdio.h"
-#include "zlog.h"
-
-struct fpm_globals_s fpm_globals;
-
-int fpm_init(int argc, char **argv, char *config)
-{
- fpm_globals.argc = argc;
- fpm_globals.argv = argv;
- fpm_globals.config = config;
-
- if (0 > fpm_php_init_main() ||
- 0 > fpm_stdio_init_main() ||
- 0 > fpm_conf_init_main() ||
- 0 > fpm_unix_init_main() ||
- 0 > fpm_env_init_main() ||
- 0 > fpm_signals_init_main() ||
- 0 > fpm_pctl_init_main() ||
- 0 > fpm_children_init_main() ||
- 0 > fpm_sockets_init_main() ||
- 0 > fpm_worker_pool_init_main() ||
- 0 > fpm_event_init_main()) {
- return -1;
- }
-
- if (0 > fpm_conf_write_pid()) {
- return -1;
- }
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "fpm is running, pid %d", (int) fpm_globals.parent_pid);
-
- return 0;
-}
-
-/* children: return listening socket
- parent: never return */
-int fpm_run(int *max_requests)
-{
- struct fpm_worker_pool_s *wp;
-
- /* create initial children in all pools */
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
- int is_parent;
-
- is_parent = fpm_children_create_initial(wp);
-
- if (!is_parent) {
- goto run_child;
- }
- }
-
- /* run event loop forever */
- fpm_event_loop();
-
-run_child: /* only workers reach this point */
-
- fpm_cleanups_run(FPM_CLEANUP_CHILD);
-
- *max_requests = fpm_globals.max_requests;
- return fpm_globals.listening_socket;
-}
-
diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h
deleted file mode 100644
index a78e75f..0000000
--- a/sapi/fpm/fpm/fpm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
- /* $Id: fpm.h,v 1.13 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_H
-#define FPM_H 1
-
-#include <unistd.h>
-
-int fpm_run(int *max_requests);
-int fpm_init(int argc, char **argv, char *config);
-
-struct fpm_globals_s {
- pid_t parent_pid;
- int argc;
- char **argv;
- char *config;
- int running_children;
- int error_log_fd;
- int log_level;
- int listening_socket; /* for this child */
- int max_requests; /* for this child */
- int is_child;
-};
-
-extern struct fpm_globals_s fpm_globals;
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_arrays.h b/sapi/fpm/fpm/fpm_arrays.h
deleted file mode 100644
index fee6661..0000000
--- a/sapi/fpm/fpm/fpm_arrays.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
- /* $Id: fpm_arrays.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_ARRAYS_H
-#define FPM_ARRAYS_H 1
-
-#include <stdlib.h>
-#include <string.h>
-
-struct fpm_array_s {
- void *data;
- size_t sz;
- size_t used;
- size_t allocated;
-};
-
-static inline struct fpm_array_s *fpm_array_init(struct fpm_array_s *a, unsigned int sz, unsigned int initial_num)
-{
- void *allocated = 0;
-
- if (!a) {
- a = malloc(sizeof(struct fpm_array_s));
-
- if (!a) {
- return 0;
- }
-
- allocated = a;
- }
-
- a->sz = sz;
-
- a->data = calloc(sz, initial_num);
-
- if (!a->data) {
- free(allocated);
- return 0;
- }
-
- a->allocated = initial_num;
- a->used = 0;
-
- return a;
-}
-
-static inline void *fpm_array_item(struct fpm_array_s *a, unsigned int n)
-{
- char *ret;
-
- ret = (char *) a->data + a->sz * n;
-
- return ret;
-}
-
-static inline void *fpm_array_item_last(struct fpm_array_s *a)
-{
- return fpm_array_item(a, a->used - 1);
-}
-
-static inline int fpm_array_item_remove(struct fpm_array_s *a, unsigned int n)
-{
- int ret = -1;
-
- if (n < a->used - 1) {
- void *last = fpm_array_item(a, a->used - 1);
- void *to_remove = fpm_array_item(a, n);
-
- memcpy(to_remove, last, a->sz);
-
- ret = n;
- }
-
- --a->used;
-
- return ret;
-}
-
-static inline void *fpm_array_push(struct fpm_array_s *a)
-{
- void *ret;
-
- if (a->used == a->allocated) {
- size_t new_allocated = a->allocated ? a->allocated * 2 : 20;
- void *new_ptr = realloc(a->data, a->sz * new_allocated);
-
- if (!new_ptr) {
- return 0;
- }
-
- a->data = new_ptr;
- a->allocated = new_allocated;
- }
-
- ret = fpm_array_item(a, a->used);
-
- ++a->used;
-
- return ret;
-}
-
-static inline void fpm_array_free(struct fpm_array_s *a)
-{
- free(a->data);
- a->data = 0;
- a->sz = 0;
- a->used = a->allocated = 0;
-}
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_atomic.h b/sapi/fpm/fpm/fpm_atomic.h
deleted file mode 100644
index 3334ae0..0000000
--- a/sapi/fpm/fpm/fpm_atomic.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
- /* $Id: fpm_atomic.h,v 1.3 2008/09/18 23:34:11 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_ATOMIC_H
-#define FPM_ATOMIC_H 1
-
-#include <stdint.h>
-#include <sched.h>
-
-#if ( __i386__ || __i386 )
-
-typedef int32_t atomic_int_t;
-typedef uint32_t atomic_uint_t;
-typedef volatile atomic_uint_t atomic_t;
-
-
-static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
-{
- __asm__ volatile ( "lock;" "xaddl %0, %1;" :
- "+r" (add) : "m" (*value) : "memory");
-
- return add;
-}
-
-static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
-{
- unsigned char res;
-
- __asm__ volatile ( "lock;" "cmpxchgl %3, %1;" "sete %0;" :
- "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
-
- return res;
-}
-
-#elif ( __amd64__ || __amd64 )
-
-typedef int64_t atomic_int_t;
-typedef uint64_t atomic_uint_t;
-typedef volatile atomic_uint_t atomic_t;
-
-static inline atomic_int_t atomic_fetch_add(atomic_t *value, atomic_int_t add)
-{
- __asm__ volatile ( "lock;" "xaddq %0, %1;" :
- "+r" (add) : "m" (*value) : "memory");
-
- return add;
-}
-
-static inline atomic_uint_t atomic_cmp_set(atomic_t *lock, atomic_uint_t old, atomic_uint_t set)
-{
- unsigned char res;
-
- __asm__ volatile ( "lock;" "cmpxchgq %3, %1;" "sete %0;" :
- "=a" (res) : "m" (*lock), "a" (old), "r" (set) : "memory");
-
- return res;
-}
-
-#else
-
-#error unsupported processor. please write a patch and send it to me
-
-#endif
-
-static inline int fpm_spinlock(atomic_t *lock, int try_once)
-{
- if (try_once) {
- return atomic_cmp_set(lock, 0, 1) ? 0 : -1;
- }
-
- for (;;) {
-
- if (atomic_cmp_set(lock, 0, 1)) {
- break;
- }
-
- sched_yield();
- }
-
- return 0;
-}
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c
deleted file mode 100644
index f586405..0000000
--- a/sapi/fpm/fpm/fpm_children.c
+++ /dev/null
@@ -1,385 +0,0 @@
-
- /* $Id: fpm_children.c,v 1.32.2.2 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "fpm.h"
-#include "fpm_children.h"
-#include "fpm_signals.h"
-#include "fpm_worker_pool.h"
-#include "fpm_sockets.h"
-#include "fpm_process_ctl.h"
-#include "fpm_php.h"
-#include "fpm_conf.h"
-#include "fpm_cleanup.h"
-#include "fpm_events.h"
-#include "fpm_clock.h"
-#include "fpm_stdio.h"
-#include "fpm_unix.h"
-#include "fpm_env.h"
-#include "fpm_shm_slots.h"
-
-#include "zlog.h"
-
-static time_t *last_faults;
-static int fault;
-
-static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop);
-
-static void fpm_children_cleanup(int which, void *arg)
-{
- free(last_faults);
-}
-
-static struct fpm_child_s *fpm_child_alloc()
-{
- struct fpm_child_s *ret;
-
- ret = malloc(sizeof(struct fpm_child_s));
-
- if (!ret) return 0;
-
- memset(ret, 0, sizeof(*ret));
-
- return ret;
-}
-
-static void fpm_child_free(struct fpm_child_s *child)
-{
- free(child);
-}
-
-static void fpm_child_close(struct fpm_child_s *child, int in_event_loop)
-{
- if (child->fd_stdout != -1) {
- if (in_event_loop) {
- fpm_event_fire(&child->ev_stdout);
- }
- if (child->fd_stdout != -1) {
- close(child->fd_stdout);
- }
- }
-
- if (child->fd_stderr != -1) {
- if (in_event_loop) {
- fpm_event_fire(&child->ev_stderr);
- }
- if (child->fd_stderr != -1) {
- close(child->fd_stderr);
- }
- }
-
- fpm_child_free(child);
-}
-
-static void fpm_child_link(struct fpm_child_s *child)
-{
- struct fpm_worker_pool_s *wp = child->wp;
-
- ++wp->running_children;
- ++fpm_globals.running_children;
-
- child->next = wp->children;
- if (child->next) child->next->prev = child;
- child->prev = 0;
- wp->children = child;
-}
-
-static void fpm_child_unlink(struct fpm_child_s *child)
-{
- --child->wp->running_children;
- --fpm_globals.running_children;
-
- if (child->prev) child->prev->next = child->next;
- else child->wp->children = child->next;
- if (child->next) child->next->prev = child->prev;
-
-}
-
-static struct fpm_child_s *fpm_child_find(pid_t pid)
-{
- struct fpm_worker_pool_s *wp;
- struct fpm_child_s *child = 0;
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-
- for (child = wp->children; child; child = child->next) {
- if (child->pid == pid) {
- break;
- }
- }
-
- if (child) break;
- }
-
- if (!child) {
- return 0;
- }
-
- return child;
-}
-
-static void fpm_child_init(struct fpm_worker_pool_s *wp)
-{
- fpm_globals.max_requests = wp->config->max_requests;
-
- if (0 > fpm_stdio_init_child(wp) ||
- 0 > fpm_unix_init_child(wp) ||
- 0 > fpm_signals_init_child() ||
- 0 > fpm_env_init_child(wp) ||
- 0 > fpm_php_init_child(wp)) {
-
- zlog(ZLOG_STUFF, ZLOG_ERROR, "child failed to initialize (pool %s)", wp->config->name);
- exit(255);
- }
-}
-
-int fpm_children_free(struct fpm_child_s *child)
-{
- struct fpm_child_s *next;
-
- for (; child; child = next) {
- next = child->next;
- fpm_child_close(child, 0 /* in_event_loop */);
- }
-
- return 0;
-}
-
-void fpm_children_bury()
-{
- int status;
- pid_t pid;
- struct fpm_child_s *child;
-
- while ( (pid = waitpid(-1, &status, WNOHANG | WUNTRACED)) > 0) {
- char buf[128];
- int severity = ZLOG_NOTICE;
-
- child = fpm_child_find(pid);
-
- if (WIFEXITED(status)) {
-
- snprintf(buf, sizeof(buf), "with code %d", WEXITSTATUS(status));
-
- if (WEXITSTATUS(status) != 0) {
- severity = ZLOG_WARNING;
- }
-
- }
- else if (WIFSIGNALED(status)) {
- const char *signame = fpm_signal_names[WTERMSIG(status)];
- const char *have_core = WCOREDUMP(status) ? " (core dumped)" : "";
-
- if (signame == NULL) {
- signame = "";
- }
-
- snprintf(buf, sizeof(buf), "on signal %d %s%s", WTERMSIG(status), signame, have_core);
-
- if (WTERMSIG(status) != SIGQUIT) { /* possible request loss */
- severity = ZLOG_WARNING;
- }
- }
- else if (WIFSTOPPED(status)) {
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d stopped for tracing", (int) pid);
-
- if (child && child->tracer) {
- child->tracer(child);
- }
-
- continue;
- }
-
- if (child) {
- struct fpm_worker_pool_s *wp = child->wp;
- struct timeval tv1, tv2;
-
- fpm_child_unlink(child);
-
- fpm_shm_slots_discard_slot(child);
-
- fpm_clock_get(&tv1);
-
- timersub(&tv1, &child->started, &tv2);
-
- zlog(ZLOG_STUFF, severity, "child %d (pool %s) exited %s after %ld.%06d seconds from start", (int) pid,
- child->wp->config->name, buf, tv2.tv_sec, (int) tv2.tv_usec);
-
- fpm_child_close(child, 1 /* in event_loop */);
-
- fpm_pctl_child_exited();
-
- if (last_faults && (WTERMSIG(status) == SIGSEGV || WTERMSIG(status) == SIGBUS)) {
- time_t now = tv1.tv_sec;
- int restart_condition = 1;
- int i;
-
- last_faults[fault++] = now;
-
- if (fault == fpm_global_config.emergency_restart_threshold) {
- fault = 0;
- }
-
- for (i = 0; i < fpm_global_config.emergency_restart_threshold; i++) {
- if (now - last_faults[i] > fpm_global_config.emergency_restart_interval) {
- restart_condition = 0;
- break;
- }
- }
-
- if (restart_condition) {
-
- zlog(ZLOG_STUFF, ZLOG_WARNING, "failed processes threshold (%d in %d sec) is reached, initiating reload",
- fpm_global_config.emergency_restart_threshold, fpm_global_config.emergency_restart_interval);
-
- fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
- }
- }
-
- fpm_children_make(wp, 1 /* in event loop */);
-
- if (fpm_globals.is_child) {
- break;
- }
- }
- else {
- zlog(ZLOG_STUFF, ZLOG_ALERT, "oops, unknown child exited %s", buf);
- }
- }
-
-}
-
-static struct fpm_child_s *fpm_resources_prepare(struct fpm_worker_pool_s *wp)
-{
- struct fpm_child_s *c;
-
- c = fpm_child_alloc();
-
- if (!c) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "malloc failed (pool %s)", wp->config->name);
- return 0;
- }
-
- c->wp = wp;
- c->fd_stdout = -1; c->fd_stderr = -1;
-
- if (0 > fpm_stdio_prepare_pipes(c)) {
- fpm_child_free(c);
- return 0;
- }
-
- if (0 > fpm_shm_slots_prepare_slot(c)) {
- fpm_stdio_discard_pipes(c);
- fpm_child_free(c);
- return 0;
- }
-
- return c;
-}
-
-static void fpm_resources_discard(struct fpm_child_s *child)
-{
- fpm_shm_slots_discard_slot(child);
- fpm_stdio_discard_pipes(child);
- fpm_child_free(child);
-}
-
-static void fpm_child_resources_use(struct fpm_child_s *child)
-{
- fpm_shm_slots_child_use_slot(child);
- fpm_stdio_child_use_pipes(child);
- fpm_child_free(child);
-}
-
-static void fpm_parent_resources_use(struct fpm_child_s *child)
-{
- fpm_shm_slots_parent_use_slot(child);
- fpm_stdio_parent_use_pipes(child);
- fpm_child_link(child);
-}
-
-static int fpm_children_make(struct fpm_worker_pool_s *wp, int in_event_loop)
-{
- int enough = 0;
- pid_t pid;
- struct fpm_child_s *child;
-
- while (!enough && fpm_pctl_can_spawn_children() && wp->running_children < wp->config->pm->max_children) {
-
- child = fpm_resources_prepare(wp);
-
- if (!child) {
- enough = 1;
- break;
- }
-
- pid = fork();
-
- switch (pid) {
-
- case 0 :
- fpm_child_resources_use(child);
- fpm_globals.is_child = 1;
- if (in_event_loop) {
- fpm_event_exit_loop();
- }
- fpm_child_init(wp);
- return 0;
-
- case -1 :
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
- enough = 1;
-
- fpm_resources_discard(child);
-
- break; /* dont try any more on error */
-
- default :
- child->pid = pid;
- fpm_clock_get(&child->started);
- fpm_parent_resources_use(child);
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "child %d (pool %s) started", (int) pid, wp->config->name);
- }
-
- }
-
- return 1; /* we are done */
-}
-
-int fpm_children_create_initial(struct fpm_worker_pool_s *wp)
-{
- return fpm_children_make(wp, 0 /* not in event loop yet */);
-}
-
-int fpm_children_init_main()
-{
- if (fpm_global_config.emergency_restart_threshold &&
- fpm_global_config.emergency_restart_interval) {
-
- last_faults = malloc(sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
-
- if (!last_faults) {
- return -1;
- }
-
- memset(last_faults, 0, sizeof(time_t) * fpm_global_config.emergency_restart_threshold);
- }
-
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_children_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
-
diff --git a/sapi/fpm/fpm/fpm_children.h b/sapi/fpm/fpm/fpm_children.h
deleted file mode 100644
index c85adf9..0000000
--- a/sapi/fpm/fpm/fpm_children.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
- /* $Id: fpm_children.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_CHILDREN_H
-#define FPM_CHILDREN_H 1
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <event.h>
-
-#include "fpm_worker_pool.h"
-
-int fpm_children_create_initial(struct fpm_worker_pool_s *wp);
-int fpm_children_free(struct fpm_child_s *child);
-void fpm_children_bury();
-int fpm_children_init_main();
-
-struct fpm_child_s;
-
-struct fpm_child_s {
- struct fpm_child_s *prev, *next;
- struct timeval started;
- struct fpm_worker_pool_s *wp;
- struct event ev_stdout, ev_stderr;
- int shm_slot_i;
- int fd_stdout, fd_stderr;
- void (*tracer)(struct fpm_child_s *);
- struct timeval slow_logged;
- pid_t pid;
-};
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_cleanup.c b/sapi/fpm/fpm/fpm_cleanup.c
deleted file mode 100644
index b4ef7bb..0000000
--- a/sapi/fpm/fpm/fpm_cleanup.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
- /* $Id: fpm_cleanup.c,v 1.8 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <stdlib.h>
-
-#include "fpm_arrays.h"
-#include "fpm_cleanup.h"
-#include "zlog.h"
-
-struct cleanup_s {
- int type;
- void (*cleanup)(int, void *);
- void *arg;
-};
-
-static struct fpm_array_s cleanups = { .sz = sizeof(struct cleanup_s) };
-
-int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *arg)
-{
- struct cleanup_s *c;
-
- c = fpm_array_push(&cleanups);
-
- if (!c) {
- return -1;
- }
-
- c->type = type;
- c->cleanup = cleanup;
- c->arg = arg;
-
- return 0;
-}
-
-void fpm_cleanups_run(int type)
-{
- struct cleanup_s *c = fpm_array_item_last(&cleanups);
- int cl = cleanups.used;
-
- for ( ; cl--; c--) {
- if (c->type & type) {
- c->cleanup(type, c->arg);
- }
- }
-
- fpm_array_free(&cleanups);
-}
-
diff --git a/sapi/fpm/fpm/fpm_cleanup.h b/sapi/fpm/fpm/fpm_cleanup.h
deleted file mode 100644
index 4d7cf39..0000000
--- a/sapi/fpm/fpm/fpm_cleanup.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
- /* $Id: fpm_cleanup.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_CLEANUP_H
-#define FPM_CLEANUP_H 1
-
-int fpm_cleanup_add(int type, void (*cleanup)(int, void *), void *);
-void fpm_cleanups_run(int type);
-
-enum {
- FPM_CLEANUP_CHILD = (1 << 0),
- FPM_CLEANUP_PARENT_EXIT = (1 << 1),
- FPM_CLEANUP_PARENT_EXIT_MAIN = (1 << 2),
- FPM_CLEANUP_PARENT_EXEC = (1 << 3),
- FPM_CLEANUP_PARENT = (1 << 1) | (1 << 2) | (1 << 3),
- FPM_CLEANUP_ALL = ~0,
-};
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_clock.c b/sapi/fpm/fpm/fpm_clock.c
deleted file mode 100644
index 2abbce8..0000000
--- a/sapi/fpm/fpm/fpm_clock.c
+++ /dev/null
@@ -1,115 +0,0 @@
-
- /* $Id: fpm_clock.c,v 1.4 2008/09/18 23:19:59 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#if defined(HAVE_CLOCK_GETTIME)
-#include <time.h> /* for CLOCK_MONOTONIC */
-#endif
-
-#include "fpm_clock.h"
-#include "zlog.h"
-
-
-/* posix monotonic clock - preferred source of time */
-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
-
-static int monotonic_works;
-
-int fpm_clock_init()
-{
- struct timespec ts;
-
- monotonic_works = 0;
-
- if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) {
- monotonic_works = 1;
- }
-
- return 0;
-}
-
-int fpm_clock_get(struct timeval *tv)
-{
- if (monotonic_works) {
- struct timespec ts;
-
- if (0 > clock_gettime(CLOCK_MONOTONIC, &ts)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "clock_gettime() failed");
- return -1;
- }
-
- tv->tv_sec = ts.tv_sec;
- tv->tv_usec = ts.tv_nsec / 1000;
- return 0;
- }
-
- return gettimeofday(tv, 0);
-}
-
-/* macosx clock */
-#elif defined(HAVE_CLOCK_GET_TIME)
-
-#include <mach/mach.h>
-#include <mach/clock.h>
-#include <mach/mach_error.h>
-
-static clock_serv_t mach_clock;
-
-/* this code borrowed from here: http://lists.apple.com/archives/Darwin-development/2002/Mar/msg00746.html */
-/* mach_clock also should be re-initialized in child process after fork */
-int fpm_clock_init()
-{
- kern_return_t ret;
- mach_timespec_t aTime;
-
- ret = host_get_clock_service(mach_host_self(), REALTIME_CLOCK, &mach_clock);
-
- if (ret != KERN_SUCCESS) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "host_get_clock_service() failed: %s", mach_error_string(ret));
- return -1;
- }
-
- /* test if it works */
- ret = clock_get_time(mach_clock, &aTime);
-
- if (ret != KERN_SUCCESS) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
- return -1;
- }
-
- return 0;
-}
-
-int fpm_clock_get(struct timeval *tv)
-{
- kern_return_t ret;
- mach_timespec_t aTime;
-
- ret = clock_get_time(mach_clock, &aTime);
-
- if (ret != KERN_SUCCESS) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "clock_get_time() failed: %s", mach_error_string(ret));
- return -1;
- }
-
- tv->tv_sec = aTime.tv_sec;
- tv->tv_usec = aTime.tv_nsec / 1000;
-
- return 0;
-}
-
-#else /* no clock */
-
-int fpm_clock_init()
-{
- return 0;
-}
-
-int fpm_clock_get(struct timeval *tv)
-{
- return gettimeofday(tv, 0);
-}
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_clock.h b/sapi/fpm/fpm/fpm_clock.h
deleted file mode 100644
index 6aab959..0000000
--- a/sapi/fpm/fpm/fpm_clock.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
- /* $Id: fpm_clock.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_CLOCK_H
-#define FPM_CLOCK_H 1
-
-#include <sys/time.h>
-
-int fpm_clock_init();
-int fpm_clock_get(struct timeval *tv);
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
deleted file mode 100644
index adf4f1a..0000000
--- a/sapi/fpm/fpm/fpm_conf.c
+++ /dev/null
@@ -1,532 +0,0 @@
-
- /* $Id: fpm_conf.c,v 1.33.2.3 2008/12/13 03:50:29 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "fpm.h"
-#include "fpm_conf.h"
-#include "fpm_stdio.h"
-#include "fpm_worker_pool.h"
-#include "fpm_cleanup.h"
-#include "fpm_php.h"
-#include "fpm_sockets.h"
-#include "xml_config.h"
-#include "zlog.h"
-
-
-struct fpm_global_config_s fpm_global_config;
-
-static void *fpm_global_config_ptr()
-{
- return &fpm_global_config;
-}
-
-static char *fpm_conf_set_log_level(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
-
- if (!strcmp(value, "debug")) {
- fpm_globals.log_level = ZLOG_DEBUG;
- }
- else if (!strcmp(value, "notice")) {
- fpm_globals.log_level = ZLOG_NOTICE;
- }
- else if (!strcmp(value, "warn")) {
- fpm_globals.log_level = ZLOG_WARNING;
- }
- else if (!strcmp(value, "error")) {
- fpm_globals.log_level = ZLOG_ERROR;
- }
- else if (!strcmp(value, "alert")) {
- fpm_globals.log_level = ZLOG_ALERT;
- }
- else {
- return "invalid value for 'log_level'";
- }
-
- return NULL;
-}
-
-static struct xml_conf_section xml_section_fpm_global_options = {
- .conf = &fpm_global_config_ptr,
- .path = "/configuration/global_options",
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, "emergency_restart_threshold", &xml_conf_set_slot_integer, offsetof(struct fpm_global_config_s, emergency_restart_threshold) },
- { XML_CONF_SCALAR, "emergency_restart_interval", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, emergency_restart_interval) },
- { XML_CONF_SCALAR, "process_control_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_global_config_s, process_control_timeout) },
- { XML_CONF_SCALAR, "daemonize", &xml_conf_set_slot_boolean, offsetof(struct fpm_global_config_s, daemonize) },
- { XML_CONF_SCALAR, "pid_file", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, pid_file) },
- { XML_CONF_SCALAR, "error_log", &xml_conf_set_slot_string, offsetof(struct fpm_global_config_s, error_log) },
- { XML_CONF_SCALAR, "log_level", &fpm_conf_set_log_level, 0 },
- { 0, 0, 0, 0 }
- }
-};
-
-static char *fpm_conf_set_pm_style(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- struct fpm_pm_s *c = *conf;
-
- if (!strcmp(value, "static")) {
- c->style = PM_STYLE_STATIC;
- }
- else if (!strcmp(value, "apache-like")) {
- c->style = PM_STYLE_APACHE_LIKE;
- }
- else {
- return "invalid value for 'style'";
- }
-
- return NULL;
-}
-
-static char *fpm_conf_set_rlimit_core(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- struct fpm_worker_pool_config_s *c = *conf;
-
- if (!strcmp(value, "unlimited")) {
- c->rlimit_core = -1;
- }
- else {
- int int_value;
- void *subconf = &int_value;
- char *error;
-
- error = xml_conf_set_slot_integer(&subconf, name, vv, 0);
-
- if (error) return error;
-
- if (int_value < 0) return "invalid value for 'rlimit_core'";
-
- c->rlimit_core = int_value;
- }
-
- return NULL;
-}
-
-static char *fpm_conf_set_catch_workers_output(void **conf, char *name, void *vv, intptr_t offset)
-{
- struct fpm_worker_pool_config_s *c = *conf;
- int int_value;
- void *subconf = &int_value;
- char *error;
-
- error = xml_conf_set_slot_boolean(&subconf, name, vv, 0);
-
- if (error) return error;
-
- c->catch_workers_output = int_value;
-
- return NULL;
-}
-
-static struct xml_conf_section fpm_conf_set_apache_like_subsection_conf = {
- .path = "apache_like somewhere", /* fixme */
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, "StartServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.StartServers) },
- { XML_CONF_SCALAR, "MinSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MinSpareServers) },
- { XML_CONF_SCALAR, "MaxSpareServers", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, options_apache_like.MaxSpareServers) },
- { 0, 0, 0, 0 }
- }
-};
-
-static char *fpm_conf_set_apache_like_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-{
- return xml_conf_parse_section(conf, &fpm_conf_set_apache_like_subsection_conf, xml_node);
-}
-
-static struct xml_conf_section fpm_conf_set_listen_options_subsection_conf = {
- .path = "listen options somewhere", /* fixme */
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, "backlog", &xml_conf_set_slot_integer, offsetof(struct fpm_listen_options_s, backlog) },
- { XML_CONF_SCALAR, "owner", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, owner) },
- { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, group) },
- { XML_CONF_SCALAR, "mode", &xml_conf_set_slot_string, offsetof(struct fpm_listen_options_s, mode) },
- { 0, 0, 0, 0 }
- }
-};
-
-static char *fpm_conf_set_listen_options_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-{
- void *subconf = (char *) *conf + offset;
- struct fpm_listen_options_s *lo;
-
- lo = malloc(sizeof(*lo));
-
- if (!lo) {
- return "malloc() failed";
- }
-
- memset(lo, 0, sizeof(*lo));
-
- lo->backlog = -1;
-
- * (struct fpm_listen_options_s **) subconf = lo;
-
- subconf = lo;
-
- return xml_conf_parse_section(&subconf, &fpm_conf_set_listen_options_subsection_conf, xml_node);
-}
-
-static struct xml_conf_section fpm_conf_set_pm_subsection_conf = {
- .path = "pm settings somewhere", /* fixme */
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, "style", &fpm_conf_set_pm_style, 0 },
- { XML_CONF_SCALAR, "max_children", &xml_conf_set_slot_integer, offsetof(struct fpm_pm_s, max_children) },
- { XML_CONF_SUBSECTION, "apache_like", &fpm_conf_set_apache_like_subsection, offsetof(struct fpm_pm_s, options_apache_like) },
- { 0, 0, 0, 0 }
- }
-};
-
-static char *fpm_conf_set_pm_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-{
- void *subconf = (char *) *conf + offset;
- struct fpm_pm_s *pm;
-
- pm = malloc(sizeof(*pm));
-
- if (!pm) {
- return "fpm_conf_set_pm_subsection(): malloc failed";
- }
-
- memset(pm, 0, sizeof(*pm));
-
- * (struct fpm_pm_s **) subconf = pm;
-
- subconf = pm;
-
- return xml_conf_parse_section(&subconf, &fpm_conf_set_pm_subsection_conf, xml_node);
-}
-
-static char *xml_conf_set_slot_key_value_pair(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- struct key_value_s *kv;
- struct key_value_s ***parent = (struct key_value_s ***) conf;
-
- kv = malloc(sizeof(*kv));
-
- if (!kv) {
- return "malloc() failed";
- }
-
- memset(kv, 0, sizeof(*kv));
-
- kv->key = strdup(name);
- kv->value = strdup(value);
-
- if (!kv->key || !kv->value) {
- return "xml_conf_set_slot_key_value_pair(): strdup() failed";
- }
-
- **parent = kv;
-
- *parent = &kv->next;
-
- return NULL;
-}
-
-static struct xml_conf_section fpm_conf_set_key_value_pairs_subsection_conf = {
- .path = "key_value_pairs somewhere", /* fixme */
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, 0, &xml_conf_set_slot_key_value_pair, 0 },
- { 0, 0, 0, 0 }
- }
-};
-
-static char *fpm_conf_set_key_value_pairs_subsection(void **conf, char *name, void *xml_node, intptr_t offset)
-{
- void *next_kv = (char *) *conf + offset;
-
- return xml_conf_parse_section(&next_kv, &fpm_conf_set_key_value_pairs_subsection_conf, xml_node);
-}
-
-static void *fpm_worker_pool_config_alloc()
-{
- static struct fpm_worker_pool_s *current_wp = 0;
- struct fpm_worker_pool_s *wp;
-
- wp = fpm_worker_pool_alloc();
-
- if (!wp) return 0;
-
- wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
-
- if (!wp->config) return 0;
-
- memset(wp->config, 0, sizeof(struct fpm_worker_pool_config_s));
-
- if (current_wp) current_wp->next = wp;
-
- current_wp = wp;
-
- return wp->config;
-}
-
-int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc)
-{
- struct key_value_s *kv, *kv_next;
-
- free(wpc->name);
- free(wpc->listen_address);
- if (wpc->listen_options) {
- free(wpc->listen_options->owner);
- free(wpc->listen_options->group);
- free(wpc->listen_options->mode);
- free(wpc->listen_options);
- }
- for (kv = wpc->php_defines; kv; kv = kv_next) {
- kv_next = kv->next;
- free(kv->key);
- free(kv->value);
- free(kv);
- }
- for (kv = wpc->environment; kv; kv = kv_next) {
- kv_next = kv->next;
- free(kv->key);
- free(kv->value);
- free(kv);
- }
- free(wpc->pm);
- free(wpc->user);
- free(wpc->group);
- free(wpc->chroot);
- free(wpc->chdir);
- free(wpc->allowed_clients);
- free(wpc->slowlog);
-
- return 0;
-}
-
-static struct xml_conf_section xml_section_fpm_worker_pool_config = {
- .conf = &fpm_worker_pool_config_alloc,
- .path = "/configuration/workers/pool",
- .parsers = (struct xml_value_parser []) {
- { XML_CONF_SCALAR, "name", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, name) },
- { XML_CONF_SCALAR, "listen_address", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, listen_address) },
- { XML_CONF_SUBSECTION, "listen_options", &fpm_conf_set_listen_options_subsection, offsetof(struct fpm_worker_pool_config_s, listen_options) },
- { XML_CONF_SUBSECTION, "php_defines", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, php_defines) },
- { XML_CONF_SCALAR, "user", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, user) },
- { XML_CONF_SCALAR, "group", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, group) },
- { XML_CONF_SCALAR, "chroot", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chroot) },
- { XML_CONF_SCALAR, "chdir", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, chdir) },
- { XML_CONF_SCALAR, "allowed_clients", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, allowed_clients) },
- { XML_CONF_SUBSECTION, "environment", &fpm_conf_set_key_value_pairs_subsection, offsetof(struct fpm_worker_pool_config_s, environment) },
- { XML_CONF_SCALAR, "request_terminate_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_terminate_timeout) },
- { XML_CONF_SCALAR, "request_slowlog_timeout", &xml_conf_set_slot_time, offsetof(struct fpm_worker_pool_config_s, request_slowlog_timeout) },
- { XML_CONF_SCALAR, "slowlog", &xml_conf_set_slot_string, offsetof(struct fpm_worker_pool_config_s, slowlog) },
- { XML_CONF_SCALAR, "rlimit_files", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, rlimit_files) },
- { XML_CONF_SCALAR, "rlimit_core", &fpm_conf_set_rlimit_core, 0 },
- { XML_CONF_SCALAR, "max_requests", &xml_conf_set_slot_integer, offsetof(struct fpm_worker_pool_config_s, max_requests) },
- { XML_CONF_SCALAR, "catch_workers_output", &fpm_conf_set_catch_workers_output, 0 },
- { XML_CONF_SUBSECTION, "pm", &fpm_conf_set_pm_subsection, offsetof(struct fpm_worker_pool_config_s, pm) },
- { 0, 0, 0, 0 }
- }
-};
-
-static struct xml_conf_section *fpm_conf_all_sections[] = {
- &xml_section_fpm_global_options,
- &xml_section_fpm_worker_pool_config,
- 0
-};
-
-static int fpm_evaluate_full_path(char **path)
-{
- if (**path != '/') {
- char *full_path;
-
- full_path = malloc(sizeof(PHP_PREFIX) + strlen(*path) + 1);
-
- if (!full_path) return -1;
-
- sprintf(full_path, "%s/%s", PHP_PREFIX, *path);
-
- free(*path);
-
- *path = full_path;
- }
-
- return 0;
-}
-
-static int fpm_conf_process_all_pools()
-{
- struct fpm_worker_pool_s *wp;
-
- if (!fpm_worker_all_pools) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "at least one pool section must be specified in config file");
- return -1;
- }
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-
- if (wp->config->listen_address && *wp->config->listen_address) {
-
- wp->listen_address_domain = fpm_sockets_domain_from_address(wp->config->listen_address);
-
- if (wp->listen_address_domain == FPM_AF_UNIX && *wp->config->listen_address != '/') {
- fpm_evaluate_full_path(&wp->config->listen_address);
- }
-
- }
- else {
-
- wp->is_template = 1;
-
- }
-
- if (wp->config->request_slowlog_timeout) {
-#if HAVE_FPM_TRACE
- if (! (wp->config->slowlog && *wp->config->slowlog)) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "pool %s: 'slowlog' must be specified for use with 'request_slowlog_timeout'",
- wp->config->name);
- return -1;
- }
-#else
- static int warned = 0;
-
- if (!warned) {
- zlog(ZLOG_STUFF, ZLOG_WARNING, "pool %s: 'request_slowlog_timeout' is not supported on your system",
- wp->config->name);
- warned = 1;
- }
-
- wp->config->request_slowlog_timeout = 0;
-#endif
- }
-
- if (wp->config->request_slowlog_timeout && wp->config->slowlog && *wp->config->slowlog) {
- int fd;
-
- fpm_evaluate_full_path(&wp->config->slowlog);
-
- if (wp->config->request_slowlog_timeout) {
- fd = open(wp->config->slowlog, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
-
- if (0 > fd) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", wp->config->slowlog);
- return -1;
- }
- close(fd);
- }
- }
- }
-
- return 0;
-}
-
-int fpm_conf_unlink_pid()
-{
- if (fpm_global_config.pid_file) {
-
- if (0 > unlink(fpm_global_config.pid_file)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "unlink(\"%s\") failed", fpm_global_config.pid_file);
- return -1;
- }
-
- }
-
- return 0;
-}
-
-int fpm_conf_write_pid()
-{
- int fd;
-
- if (fpm_global_config.pid_file) {
- char buf[64];
- int len;
-
- unlink(fpm_global_config.pid_file);
-
- fd = creat(fpm_global_config.pid_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-
- if (fd < 0) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "creat(\"%s\") failed", fpm_global_config.pid_file);
- return -1;
- }
-
- len = sprintf(buf, "%d", (int) fpm_globals.parent_pid);
-
- if (len != write(fd, buf, len)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "write() failed");
- return -1;
- }
-
- close(fd);
- }
-
- return 0;
-}
-
-static int fpm_conf_post_process()
-{
- if (fpm_global_config.pid_file) {
- fpm_evaluate_full_path(&fpm_global_config.pid_file);
- }
-
- if (!fpm_global_config.error_log) {
- fpm_global_config.error_log = strdup(PHP_FPM_LOG_PATH);
- }
-
- fpm_evaluate_full_path(&fpm_global_config.error_log);
-
- if (0 > fpm_stdio_open_error_log(0)) {
- return -1;
- }
-
- return fpm_conf_process_all_pools();
-}
-
-static void fpm_conf_cleanup(int which, void *arg)
-{
- free(fpm_global_config.pid_file);
- free(fpm_global_config.error_log);
- fpm_global_config.pid_file = 0;
- fpm_global_config.error_log = 0;
-}
-
-int fpm_conf_init_main()
-{
- char *filename = fpm_globals.config;
- char *err;
-
- if (0 > xml_conf_sections_register(fpm_conf_all_sections)) {
- return -1;
- }
-
- if (filename == NULL) {
- filename = PHP_FPM_CONF_PATH;
- }
-
- err = xml_conf_load_file(filename);
-
- if (err) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "failed to load configuration file: %s", err);
- return -1;
- }
-
- if (0 > fpm_conf_post_process()) {
- return -1;
- }
-
- xml_conf_clean();
-
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_conf_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h
deleted file mode 100644
index 4dd011e..0000000
--- a/sapi/fpm/fpm/fpm_conf.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
- /* $Id: fpm_conf.h,v 1.12.2.2 2008/12/13 03:46:49 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_CONF_H
-#define FPM_CONF_H 1
-
-struct key_value_s;
-
-struct key_value_s {
- struct key_value_s *next;
- char *key;
- char *value;
-};
-
-struct fpm_global_config_s {
- int emergency_restart_threshold;
- int emergency_restart_interval;
- int process_control_timeout;
- int daemonize;
- char *pid_file;
- char *error_log;
-};
-
-extern struct fpm_global_config_s fpm_global_config;
-
-struct fpm_pm_s {
- int style;
- int max_children;
- struct {
- int StartServers;
- int MinSpareServers;
- int MaxSpareServers;
- } options_apache_like;
-};
-
-struct fpm_listen_options_s {
- int backlog;
- char *owner;
- char *group;
- char *mode;
-};
-
-struct fpm_worker_pool_config_s {
- char *name;
- char *listen_address;
- struct fpm_listen_options_s *listen_options;
- struct key_value_s *php_defines;
- char *user;
- char *group;
- char *chroot;
- char *chdir;
- char *allowed_clients;
- struct key_value_s *environment;
- struct fpm_pm_s *pm;
- int request_terminate_timeout;
- int request_slowlog_timeout;
- char *slowlog;
- int max_requests;
- int rlimit_files;
- int rlimit_core;
- unsigned catch_workers_output:1;
-};
-
-enum { PM_STYLE_STATIC = 1, PM_STYLE_APACHE_LIKE = 2 };
-
-int fpm_conf_init_main();
-int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
-int fpm_conf_write_pid();
-int fpm_conf_unlink_pid();
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h
deleted file mode 100644
index 6d8a2a6..0000000
--- a/sapi/fpm/fpm/fpm_config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
- /* $Id: fpm_config.h,v 1.16 2008/05/25 00:30:43 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include <php_config.h>
-#ifdef FPM_AUTOCONFIG_H
-#include <fpm_autoconfig.h>
-#endif
-
-/* Solaris does not have it */
-#ifndef INADDR_NONE
-#define INADDR_NONE (-1)
-#endif
-
-
-/* If we're not using GNU C, elide __attribute__ */
-#ifndef __GNUC__
-# define __attribute__(x) /*NOTHING*/
-#endif
-
-
-/* Solaris does not have it */
-#ifndef timersub
-#define timersub(tvp, uvp, vvp) \
- do { \
- (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
- (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
- if ((vvp)->tv_usec < 0) { \
- (vvp)->tv_sec--; \
- (vvp)->tv_usec += 1000000; \
- } \
- } while (0)
-#endif
-
-#if defined(HAVE_PTRACE) || defined(PROC_MEM_FILE) || defined(HAVE_MACH_VM_READ)
-#define HAVE_FPM_TRACE 1
-#else
-#define HAVE_FPM_TRACE 0
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c
deleted file mode 100644
index 624a9fe..0000000
--- a/sapi/fpm/fpm/fpm_env.c
+++ /dev/null
@@ -1,125 +0,0 @@
-
- /* $Id: fpm_env.c,v 1.15 2008/09/18 23:19:59 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "fpm_env.h"
-#include "zlog.h"
-
-#ifndef HAVE_SETENV
-int setenv(char *name, char *value, int overwrite)
-{
- int name_len = strlen(name);
- int value_len = strlen(value);
- char *var = alloca(name_len + 1 + value_len + 1);
-
- memcpy(var, name, name_len);
-
- var[name_len] = '=';
-
- memcpy(var + name_len + 1, value, value_len);
-
- var[name_len + 1 + value_len] = '\0';
-
- return putenv(var);
-}
-#endif
-
-#ifndef HAVE_CLEARENV
-void clearenv()
-{
- char **envp;
- char *s;
-
- /* this algo is the only one known to me
- that works well on all systems */
- while (*(envp = environ)) {
- char *eq = strchr(*envp, '=');
-
- s = strdup(*envp);
-
- if (eq) s[eq - *envp] = '\0';
-
- unsetenv(s);
- free(s);
- }
-
-}
-#endif
-
-
-int fpm_env_init_child(struct fpm_worker_pool_s *wp)
-{
- struct key_value_s *kv;
-
- clearenv();
-
- for (kv = wp->config->environment; kv; kv = kv->next) {
- setenv(kv->key, kv->value, 1);
- }
-
- if (wp->user) {
- setenv("USER", wp->user, 1);
- }
-
- if (wp->home) {
- setenv("HOME", wp->home, 1);
- }
-
- return 0;
-}
-
-static int fpm_env_conf_wp(struct fpm_worker_pool_s *wp)
-{
- struct key_value_s *kv;
-
- kv = wp->config->environment;
-
- for (kv = wp->config->environment; kv; kv = kv->next) {
- if (*kv->value == '$') {
- char *value = getenv(kv->value + 1);
-
- if (!value) value = "";
-
- free(kv->value);
- kv->value = strdup(value);
- }
-
- /* autodetected values should be removed
- if these vars specified in config */
- if (!strcmp(kv->key, "USER")) {
- free(wp->user);
- wp->user = 0;
- }
-
- if (!strcmp(kv->key, "HOME")) {
- free(wp->home);
- wp->home = 0;
- }
- }
-
- return 0;
-}
-
-int fpm_env_init_main()
-{
- struct fpm_worker_pool_s *wp;
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-
- if (0 > fpm_env_conf_wp(wp)) {
- return -1;
- }
-
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_env.h b/sapi/fpm/fpm/fpm_env.h
deleted file mode 100644
index 0f79ed7..0000000
--- a/sapi/fpm/fpm/fpm_env.h
+++ /dev/null
@@ -1,24 +0,0 @@
-
- /* $Id: fpm_env.h,v 1.9 2008/09/18 23:19:59 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_ENV_H
-#define FPM_ENV_H 1
-
-#include "fpm_worker_pool.h"
-
-int fpm_env_init_child(struct fpm_worker_pool_s *wp);
-int fpm_env_init_main();
-
-extern char **environ;
-
-#ifndef HAVE_SETENV
-int setenv(char *name, char *value, int overwrite);
-#endif
-
-#ifndef HAVE_CLEARENV
-void clearenv();
-#endif
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c
deleted file mode 100644
index 654e9c8..0000000
--- a/sapi/fpm/fpm/fpm_events.c
+++ /dev/null
@@ -1,135 +0,0 @@
-
- /* $Id: fpm_events.c,v 1.21.2.2 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h> /* for putenv */
-#include <string.h>
-#include <sys/types.h> /* for event.h below */
-#include <event.h>
-
-#include "fpm.h"
-#include "fpm_process_ctl.h"
-#include "fpm_events.h"
-#include "fpm_cleanup.h"
-#include "fpm_stdio.h"
-#include "fpm_signals.h"
-#include "fpm_children.h"
-#include "zlog.h"
-
-static void fpm_event_cleanup(int which, void *arg)
-{
- event_base_free(0);
-}
-
-static void fpm_got_signal(int fd, short ev, void *arg)
-{
- char c;
- int res;
-
- do {
-
- do {
- res = read(fd, &c, 1);
- } while (res == -1 && errno == EINTR);
-
- if (res <= 0) {
- if (res < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
- }
- return;
- }
-
- switch (c) {
- case 'C' : /* SIGCHLD */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGCHLD");
- fpm_children_bury();
- break;
- case 'I' : /* SIGINT */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGINT");
- fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
- break;
- case 'T' : /* SIGTERM */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGTERM");
- fpm_pctl(FPM_PCTL_STATE_TERMINATING, FPM_PCTL_ACTION_SET);
- break;
- case 'Q' : /* SIGQUIT */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGQUIT");
- fpm_pctl(FPM_PCTL_STATE_FINISHING, FPM_PCTL_ACTION_SET);
- break;
- case '1' : /* SIGUSR1 */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR1");
- if (0 == fpm_stdio_open_error_log(1)) {
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "log file re-opened");
- }
- break;
- case '2' : /* SIGUSR2 */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "received SIGUSR2");
- fpm_pctl(FPM_PCTL_STATE_RELOADING, FPM_PCTL_ACTION_SET);
- break;
- }
-
- if (fpm_globals.is_child) {
- break;
- }
-
- } while (1);
-
- return;
-}
-
-int fpm_event_init_main()
-{
- event_init();
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: using %s", event_get_method());
-
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_event_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
-
-int fpm_event_loop()
-{
- static struct event signal_fd_event;
-
- event_set(&signal_fd_event, fpm_signals_get_fd(), EV_PERSIST | EV_READ, &fpm_got_signal, 0);
-
- event_add(&signal_fd_event, 0);
-
- fpm_pctl_heartbeat(-1, 0, 0);
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "libevent: entering main loop");
-
- event_loop(0);
-
- return 0;
-}
-
-int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg)
-{
- event_set(ev, fd, EV_PERSIST | EV_READ, callback, arg);
-
- return event_add(ev, 0);
-}
-
-int fpm_event_del(struct event *ev)
-{
- return event_del(ev);
-}
-
-void fpm_event_exit_loop()
-{
- event_loopbreak();
-}
-
-void fpm_event_fire(struct event *ev)
-{
- (*ev->ev_callback)( (int) ev->ev_fd, (short) ev->ev_res, ev->ev_arg);
-}
-
diff --git a/sapi/fpm/fpm/fpm_events.h b/sapi/fpm/fpm/fpm_events.h
deleted file mode 100644
index d5a45ce..0000000
--- a/sapi/fpm/fpm/fpm_events.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
- /* $Id: fpm_events.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_EVENTS_H
-#define FPM_EVENTS_H 1
-
-void fpm_event_exit_loop();
-int fpm_event_loop();
-int fpm_event_add(int fd, struct event *ev, void (*callback)(int, short, void *), void *arg);
-int fpm_event_del(struct event *ev);
-void fpm_event_fire(struct event *ev);
-int fpm_event_init_main();
-
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
deleted file mode 100644
index b017869..0000000
--- a/sapi/fpm/fpm/fpm_main.c
+++ /dev/null
@@ -1,2253 +0,0 @@
-/*
- +----------------------------------------------------------------------+
- | PHP Version 5 |
- +----------------------------------------------------------------------+
- | Copyright (c) 1997-2009 The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
- | Stig Bakken <ssb@php.net> |
- | Zeev Suraski <zeev@zend.com> |
- | FastCGI: Ben Mansell <php@slimyhorror.com> |
- | Shane Caraveo <shane@caraveo.com> |
- | Dmitry Stogov <dmitry@zend.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: cgi_main.c 291497 2009-11-30 14:43:22Z dmitry $ */
-
-#include "php.h"
-#include "php_globals.h"
-#include "php_variables.h"
-#include "zend_modules.h"
-
-#include "SAPI.h"
-
-#include <stdio.h>
-#include "php.h"
-
-#ifdef PHP_WIN32
-# include "win32/time.h"
-# include "win32/signal.h"
-# include <process.h>
-#endif
-
-#if HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-
-#if HAVE_SETLOCALE
-# include <locale.h>
-#endif
-
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#if HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-#include "zend.h"
-#include "zend_extensions.h"
-#include "php_ini.h"
-#include "php_globals.h"
-#include "php_main.h"
-#include "fopen_wrappers.h"
-#include "ext/standard/php_standard.h"
-
-#ifdef PHP_WIN32
-# include <io.h>
-# include <fcntl.h>
-# include "win32/php_registry.h"
-#endif
-
-#ifdef __riscos__
-# include <unixlib/local.h>
-int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
-#endif
-
-#include "zend_compile.h"
-#include "zend_execute.h"
-#include "zend_highlight.h"
-#include "zend_indent.h"
-
-#include "php_getopt.h"
-
-#include "fastcgi.h"
-
-#ifndef PHP_WIN32
-/* XXX this will need to change later when threaded fastcgi is implemented. shane */
-struct sigaction act, old_term, old_quit, old_int;
-#endif
-
-static void (*php_php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
-
-#ifndef PHP_WIN32
-/* these globals used for forking children on unix systems */
-/**
- * Number of child processes that will get created to service requests
- */
-static int children = 0;
-
-/**
- * Set to non-zero if we are the parent process
- */
-static int parent = 1;
-
-/* Did parent received exit signals SIG_TERM/SIG_INT/SIG_QUIT */
-static int exit_signal = 0;
-
-/* Is Parent waiting for children to exit */
-static int parent_waiting = 0;
-
-/**
- * Process group
- */
-static pid_t pgroup;
-#endif
-
-#define PHP_MODE_STANDARD 1
-#define PHP_MODE_HIGHLIGHT 2
-#define PHP_MODE_INDENT 3
-#define PHP_MODE_LINT 4
-#define PHP_MODE_STRIP 5
-
-static char *php_optarg = NULL;
-static int php_optind = 1;
-static zend_module_entry cgi_module_entry;
-
-static const opt_struct OPTIONS[] = {
- {'a', 0, "interactive"},
- {'b', 1, "bindpath"},
- {'C', 0, "no-chdir"},
- {'c', 1, "php-ini"},
- {'d', 1, "define"},
- {'e', 0, "profile-info"},
- {'f', 1, "file"},
- {'h', 0, "help"},
- {'i', 0, "info"},
- {'l', 0, "syntax-check"},
- {'m', 0, "modules"},
- {'n', 0, "no-php-ini"},
- {'q', 0, "no-header"},
- {'s', 0, "syntax-highlight"},
- {'s', 0, "syntax-highlighting"},
- {'w', 0, "strip"},
- {'?', 0, "usage"},/* help alias (both '?' and 'usage') */
- {'v', 0, "version"},
- {'z', 1, "zend-extension"},
- {'T', 1, "timing"},
- {'-', 0, NULL} /* end of args */
-};
-
-typedef struct _php_cgi_globals_struct {
- zend_bool rfc2616_headers;
- zend_bool nph;
- zend_bool check_shebang_line;
- zend_bool fix_pathinfo;
- zend_bool force_redirect;
- zend_bool discard_path;
- zend_bool fcgi_logging;
- char *redirect_status_env;
-#ifdef PHP_WIN32
- zend_bool impersonate;
-#endif
- HashTable user_config_cache;
-} php_cgi_globals_struct;
-
-/* {{{ user_config_cache
- *
- * Key for each cache entry is dirname(PATH_TRANSLATED).
- *
- * NOTE: Each cache entry config_hash contains the combination from all user ini files found in
- * the path starting from doc_root throught to dirname(PATH_TRANSLATED). There is no point
- * storing per-file entries as it would not be possible to detect added / deleted entries
- * between separate files.
- */
-typedef struct _user_config_cache_entry {
- time_t expires;
- HashTable *user_config;
-} user_config_cache_entry;
-
-static void user_config_cache_entry_dtor(user_config_cache_entry *entry)
-{
- zend_hash_destroy(entry->user_config);
- free(entry->user_config);
-}
-/* }}} */
-
-#ifdef ZTS
-static int php_cgi_globals_id;
-#define CGIG(v) TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
-#else
-static php_cgi_globals_struct php_cgi_globals;
-#define CGIG(v) (php_cgi_globals.v)
-#endif
-
-#ifdef PHP_WIN32
-#define TRANSLATE_SLASHES(path) \
- { \
- char *tmp = path; \
- while (*tmp) { \
- if (*tmp == '\\') *tmp = '/'; \
- tmp++; \
- } \
- }
-#else
-#define TRANSLATE_SLASHES(path)
-#endif
-
-static int print_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
-{
- php_printf("%s\n", module->name);
- return 0;
-}
-
-static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
-{
- Bucket *f = *((Bucket **) a);
- Bucket *s = *((Bucket **) b);
-
- return strcasecmp( ((zend_module_entry *)f->pData)->name,
- ((zend_module_entry *)s->pData)->name);
-}
-
-static void print_modules(TSRMLS_D)
-{
- HashTable sorted_registry;
- zend_module_entry tmp;
-
- zend_hash_init(&sorted_registry, 50, NULL, NULL, 1);
- zend_hash_copy(&sorted_registry, &module_registry, NULL, &tmp, sizeof(zend_module_entry));
- zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC);
- zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t) print_module_info, NULL TSRMLS_CC);
- zend_hash_destroy(&sorted_registry);
-}
-
-static int print_extension_info(zend_extension *ext, void *arg TSRMLS_DC)
-{
- php_printf("%s\n", ext->name);
- return 0;
-}
-
-static int extension_name_cmp(const zend_llist_element **f, const zend_llist_element **s TSRMLS_DC)
-{
- return strcmp( ((zend_extension *)(*f)->data)->name,
- ((zend_extension *)(*s)->data)->name);
-}
-
-static void print_extensions(TSRMLS_D)
-{
- zend_llist sorted_exts;
-
- zend_llist_copy(&sorted_exts, &zend_extensions);
- sorted_exts.dtor = NULL;
- zend_llist_sort(&sorted_exts, extension_name_cmp TSRMLS_CC);
- zend_llist_apply_with_argument(&sorted_exts, (llist_apply_with_arg_func_t) print_extension_info, NULL TSRMLS_CC);
- zend_llist_destroy(&sorted_exts);
-}
-
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-static inline size_t sapi_cgibin_single_write(const char *str, uint str_length TSRMLS_DC)
-{
-#ifdef PHP_WRITE_STDOUT
- long ret;
-#else
- size_t ret;
-#endif
-
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
- long ret = fcgi_write(request, FCGI_STDOUT, str, str_length);
- if (ret <= 0) {
- return 0;
- }
- return ret;
- }
-
-#ifdef PHP_WRITE_STDOUT
- ret = write(STDOUT_FILENO, str, str_length);
- if (ret <= 0) return 0;
- return ret;
-#else
- ret = fwrite(str, 1, MIN(str_length, 16384), stdout);
- return ret;
-#endif
-}
-
-static int sapi_cgibin_ub_write(const char *str, uint str_length TSRMLS_DC)
-{
- const char *ptr = str;
- uint remaining = str_length;
- size_t ret;
-
- while (remaining > 0) {
- ret = sapi_cgibin_single_write(ptr, remaining TSRMLS_CC);
- if (!ret) {
- php_handle_aborted_connection();
- return str_length - remaining;
- }
- ptr += ret;
- remaining -= ret;
- }
-
- return str_length;
-}
-
-
-static void sapi_cgibin_flush(void *server_context)
-{
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) server_context;
- if (
-#ifndef PHP_WIN32
- !parent &&
-#endif
- request && !fcgi_flush(request, 0)) {
- php_handle_aborted_connection();
- }
- return;
- }
- if (fflush(stdout) == EOF) {
- php_handle_aborted_connection();
- }
-}
-
-#define SAPI_CGI_MAX_HEADER_LENGTH 1024
-
-typedef struct _http_error {
- int code;
- const char* msg;
-} http_error;
-
-static const http_error http_error_codes[] = {
- {100, "Continue"},
- {101, "Switching Protocols"},
- {200, "OK"},
- {201, "Created"},
- {202, "Accepted"},
- {203, "Non-Authoritative Information"},
- {204, "No Content"},
- {205, "Reset Content"},
- {206, "Partial Content"},
- {300, "Multiple Choices"},
- {301, "Moved Permanently"},
- {302, "Moved Temporarily"},
- {303, "See Other"},
- {304, "Not Modified"},
- {305, "Use Proxy"},
- {400, "Bad Request"},
- {401, "Unauthorized"},
- {402, "Payment Required"},
- {403, "Forbidden"},
- {404, "Not Found"},
- {405, "Method Not Allowed"},
- {406, "Not Acceptable"},
- {407, "Proxy Authentication Required"},
- {408, "Request Time-out"},
- {409, "Conflict"},
- {410, "Gone"},
- {411, "Length Required"},
- {412, "Precondition Failed"},
- {413, "Request Entity Too Large"},
- {414, "Request-URI Too Large"},
- {415, "Unsupported Media Type"},
- {500, "Internal Server Error"},
- {501, "Not Implemented"},
- {502, "Bad Gateway"},
- {503, "Service Unavailable"},
- {504, "Gateway Time-out"},
- {505, "HTTP Version not supported"},
- {0, NULL}
-};
-
-static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
-{
- char buf[SAPI_CGI_MAX_HEADER_LENGTH];
- sapi_header_struct *h;
- zend_llist_position pos;
- zend_bool ignore_status = 0;
- int response_status = SG(sapi_headers).http_response_code;
-
- if (SG(request_info).no_headers == 1) {
- return SAPI_HEADER_SENT_SUCCESSFULLY;
- }
-
- if (CGIG(nph) || SG(sapi_headers).http_response_code != 200)
- {
- int len;
- zend_bool has_status = 0;
-
- if (CGIG(rfc2616_headers) && SG(sapi_headers).http_status_line) {
- char *s;
- len = slprintf(buf, SAPI_CGI_MAX_HEADER_LENGTH, "%s\r\n", SG(sapi_headers).http_status_line);
- if ((s = strchr(SG(sapi_headers).http_status_line, ' '))) {
- response_status = atoi((s + 1));
- }
-
- if (len > SAPI_CGI_MAX_HEADER_LENGTH) {
- len = SAPI_CGI_MAX_HEADER_LENGTH;
- }
-
- } else {
- char *s;
-
- if (SG(sapi_headers).http_status_line &&
- (s = strchr(SG(sapi_headers).http_status_line, ' ')) != 0 &&
- (s - SG(sapi_headers).http_status_line) >= 5 &&
- strncasecmp(SG(sapi_headers).http_status_line, "HTTP/", 5) == 0
- ) {
- len = slprintf(buf, sizeof(buf), "Status:%s\r\n", s);
- response_status = atoi((s + 1));
- } else {
- h = (sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
- while (h) {
- if (h->header_len > sizeof("Status:")-1 &&
- strncasecmp(h->header, "Status:", sizeof("Status:")-1) == 0
- ) {
- has_status = 1;
- break;
- }
- h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
- }
- if (!has_status) {
- http_error *err = (http_error*)http_error_codes;
-
- while (err->code != 0) {
- if (err->code == SG(sapi_headers).http_response_code) {
- break;
- }
- err++;
- }
- if (err->msg) {
- len = slprintf(buf, sizeof(buf), "Status: %d %s\r\n", SG(sapi_headers).http_response_code, err->msg);
- } else {
- len = slprintf(buf, sizeof(buf), "Status: %d\r\n", SG(sapi_headers).http_response_code);
- }
- }
- }
- }
-
- if (!has_status) {
- PHPWRITE_H(buf, len);
- ignore_status = 1;
- }
- }
-
- h = (sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
- while (h) {
- /* prevent CRLFCRLF */
- if (h->header_len) {
- if (h->header_len > sizeof("Status:")-1 &&
- strncasecmp(h->header, "Status:", sizeof("Status:")-1) == 0
- ) {
- if (!ignore_status) {
- ignore_status = 1;
- PHPWRITE_H(h->header, h->header_len);
- PHPWRITE_H("\r\n", 2);
- }
- } else if (response_status == 304 && h->header_len > sizeof("Content-Type:")-1 &&
- strncasecmp(h->header, "Content-Type:", sizeof("Content-Type:")-1) == 0
- ) {
- h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
- continue;
- } else {
- PHPWRITE_H(h->header, h->header_len);
- PHPWRITE_H("\r\n", 2);
- }
- }
- h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
- }
- PHPWRITE_H("\r\n", 2);
-
- return SAPI_HEADER_SENT_SUCCESSFULLY;
-}
-
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-
-static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
-{
- uint read_bytes = 0;
- int tmp_read_bytes;
-
- count_bytes = MIN(count_bytes, (uint) SG(request_info).content_length - SG(read_post_bytes));
- while (read_bytes < count_bytes) {
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
- tmp_read_bytes = fcgi_read(request, buffer + read_bytes, count_bytes - read_bytes);
- } else {
- tmp_read_bytes = read(STDIN_FILENO, buffer + read_bytes, count_bytes - read_bytes);
- }
- if (tmp_read_bytes <= 0) {
- break;
- }
- read_bytes += tmp_read_bytes;
- }
- return read_bytes;
-}
-
-static char *sapi_cgibin_getenv(char *name, size_t name_len TSRMLS_DC)
-{
- /* when php is started by mod_fastcgi, no regular environment
- * is provided to PHP. It is always sent to PHP at the start
- * of a request. So we have to do our own lookup to get env
- * vars. This could probably be faster somehow. */
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
- return fcgi_getenv(request, name, name_len);
- }
- /* if cgi, or fastcgi and not found in fcgi env
- check the regular environment */
- return getenv(name);
-}
-
-static char *_sapi_cgibin_putenv(char *name, char *value TSRMLS_DC)
-{
- int name_len;
-#if !HAVE_SETENV || !HAVE_UNSETENV
- int len;
- char *buf;
-#endif
-
- if (!name) {
- return NULL;
- }
- name_len = strlen(name);
-
- /* when php is started by mod_fastcgi, no regular environment
- * is provided to PHP. It is always sent to PHP at the start
- * of a request. So we have to do our own lookup to get env
- * vars. This could probably be faster somehow. */
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
- return fcgi_putenv(request, name, name_len, value);
- }
-
-#if HAVE_SETENV
- if (value) {
- setenv(name, value, 1);
- }
-#endif
-#if HAVE_UNSETENV
- if (!value) {
- unsetenv(name);
- }
-#endif
-
-#if !HAVE_SETENV || !HAVE_UNSETENV
- /* if cgi, or fastcgi and not found in fcgi env
- check the regular environment
- this leaks, but it's only cgi anyway, we'll fix
- it for 5.0
- */
- len = name_len + (value ? strlen(value) : 0) + sizeof("=") + 2;
- buf = (char *) malloc(len);
- if (buf == NULL) {
- return getenv(name);
- }
-#endif
-#if !HAVE_SETENV
- if (value) {
- len = slprintf(buf, len - 1, "%s=%s", name, value);
- putenv(buf);
- }
-#endif
-#if !HAVE_UNSETENV
- if (!value) {
- len = slprintf(buf, len - 1, "%s=", name);
- putenv(buf);
- }
-#endif
- return getenv(name);
-}
-
-static char *sapi_cgi_read_cookies(TSRMLS_D)
-{
- return sapi_cgibin_getenv((char *) "HTTP_COOKIE", sizeof("HTTP_COOKIE")-1 TSRMLS_CC);
-}
-
-void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
-{
- if (PG(http_globals)[TRACK_VARS_ENV] &&
- array_ptr != PG(http_globals)[TRACK_VARS_ENV] &&
- Z_TYPE_P(PG(http_globals)[TRACK_VARS_ENV]) == IS_ARRAY &&
- zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV])) > 0
- ) {
- zval_dtor(array_ptr);
- *array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
- INIT_PZVAL(array_ptr);
- zval_copy_ctor(array_ptr);
- return;
- } else if (PG(http_globals)[TRACK_VARS_SERVER] &&
- array_ptr != PG(http_globals)[TRACK_VARS_SERVER] &&
- Z_TYPE_P(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY &&
- zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])) > 0
- ) {
- zval_dtor(array_ptr);
- *array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
- INIT_PZVAL(array_ptr);
- zval_copy_ctor(array_ptr);
- return;
- }
-
- /* call php's original import as a catch-all */
- php_php_import_environment_variables(array_ptr TSRMLS_CC);
-
- if (fcgi_is_fastcgi()) {
- fcgi_request *request = (fcgi_request*) SG(server_context);
- HashPosition pos;
- int magic_quotes_gpc = PG(magic_quotes_gpc);
- char *var, **val;
- uint var_len;
- ulong idx;
- int filter_arg = (array_ptr == PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;
-
- /* turn off magic_quotes while importing environment variables */
- PG(magic_quotes_gpc) = 0;
- for (zend_hash_internal_pointer_reset_ex(request->env, &pos);
- zend_hash_get_current_key_ex(request->env, &var, &var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING &&
- zend_hash_get_current_data_ex(request->env, (void **) &val, &pos) == SUCCESS;
- zend_hash_move_forward_ex(request->env, &pos)
- ) {
- unsigned int new_val_len;
-
- if (sapi_module.input_filter(filter_arg, var, val, strlen(*val), &new_val_len TSRMLS_CC)) {
- php_register_variable_safe(var, *val, new_val_len, array_ptr TSRMLS_CC);
- }
- }
- PG(magic_quotes_gpc) = magic_quotes_gpc;
- }
-}
-
-static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
-{
- unsigned int php_self_len;
- char *php_self;
-
- /* In CGI mode, we consider the environment to be a part of the server
- * variables
- */
- php_import_environment_variables(track_vars_array TSRMLS_CC);
-
- if (CGIG(fix_pathinfo)) {
- char *script_name = SG(request_info).request_uri;
- unsigned int script_name_len = script_name ? strlen(script_name) : 0;
- char *path_info = sapi_cgibin_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
- unsigned int path_info_len = path_info ? strlen(path_info) : 0;
-
- php_self_len = script_name_len + path_info_len;
- php_self = emalloc(php_self_len + 1);
-
- if (script_name) {
- memcpy(php_self, script_name, script_name_len + 1);
- }
- if (path_info) {
- memcpy(php_self + script_name_len, path_info, path_info_len + 1);
- }
-
- /* Build the special-case PHP_SELF variable for the CGI version */
- if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, php_self_len, &php_self_len TSRMLS_CC)) {
- php_register_variable_safe("PHP_SELF", php_self, php_self_len, track_vars_array TSRMLS_CC);
- }
- efree(php_self);
- } else {
- php_self = SG(request_info).request_uri ? SG(request_info).request_uri : "";
- php_self_len = strlen(php_self);
- if (sapi_module.input_filter(PARSE_SERVER, "PHP_SELF", &php_self, php_self_len, &php_self_len TSRMLS_CC)) {
- php_register_variable_safe("PHP_SELF", php_self, php_self_len, track_vars_array TSRMLS_CC);
- }
- }
-}
-
-static void sapi_cgi_log_message(char *message)
-{
- TSRMLS_FETCH();
-
- if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
- fcgi_request *request;
-
- request = (fcgi_request*) SG(server_context);
- if (request) {
- int len = strlen(message);
- char *buf = malloc(len+2);
-
- memcpy(buf, message, len);
- memcpy(buf + len, "\n", sizeof("\n"));
- fcgi_write(request, FCGI_STDERR, buf, len+1);
- free(buf);
- } else {
- fprintf(stderr, "%s\n", message);
- }
- /* ignore return code */
- } else {
- fprintf(stderr, "%s\n", message);
- }
-}
-
-/* {{{ php_cgi_ini_activate_user_config
- */
-static void php_cgi_ini_activate_user_config(char *path, int path_len, const char *doc_root, int doc_root_len, int start TSRMLS_DC)
-{
- char *ptr;
- user_config_cache_entry *new_entry, *entry;
- time_t request_time = sapi_get_request_time(TSRMLS_C);
-
- /* Find cached config entry: If not found, create one */
- if (zend_hash_find(&CGIG(user_config_cache), path, path_len + 1, (void **) &entry) == FAILURE) {
- new_entry = pemalloc(sizeof(user_config_cache_entry), 1);
- new_entry->expires = 0;
- new_entry->user_config = (HashTable *) pemalloc(sizeof(HashTable), 1);
- zend_hash_init(new_entry->user_config, 0, NULL, (dtor_func_t) config_zval_dtor, 1);
- zend_hash_update(&CGIG(user_config_cache), path, path_len + 1, new_entry, sizeof(user_config_cache_entry), (void **) &entry);
- free(new_entry);
- }
-
- /* Check whether cache entry has expired and rescan if it is */
- if (request_time > entry->expires) {
- char * real_path;
- int real_path_len;
- char *s1, *s2;
- int s_len;
-
- /* Clear the expired config */
- zend_hash_clean(entry->user_config);
-
- if (!IS_ABSOLUTE_PATH(path, path_len)) {
- real_path = tsrm_realpath(path, NULL TSRMLS_CC);
- real_path_len = strlen(real_path);
- path = real_path;
- path_len = real_path_len;
- }
-
- if (path_len > doc_root_len) {
- s1 = (char *) doc_root;
- s2 = path;
- s_len = doc_root_len;
- } else {
- s1 = path;
- s2 = (char *) doc_root;
- s_len = path_len;
- }
-
- /* we have to test if path is part of DOCUMENT_ROOT.
- if it is inside the docroot, we scan the tree up to the docroot
- to find more user.ini, if not we only scan the current path.
- */
-#ifdef PHP_WIN32
- if (strnicmp(s1, s2, s_len) == 0) {
-#else
- if (strncmp(s1, s2, s_len) == 0) {
-#endif
- ptr = s2 + start; /* start is the point where doc_root ends! */
- while ((ptr = strchr(ptr, DEFAULT_SLASH)) != NULL) {
- *ptr = 0;
- php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config TSRMLS_CC);
- *ptr = '/';
- ptr++;
- }
- } else {
- php_parse_user_ini_file(path, PG(user_ini_filename), entry->user_config TSRMLS_CC);
- }
-
- entry->expires = request_time + PG(user_ini_cache_ttl);
- }
-
- /* Activate ini entries with values from the user config hash */
- php_ini_activate_config(entry->user_config, PHP_INI_PERDIR, PHP_INI_STAGE_HTACCESS TSRMLS_CC);
-}
-/* }}} */
-
-static int sapi_cgi_activate(TSRMLS_D)
-{
- char *path, *doc_root, *server_name;
- uint path_len, doc_root_len, server_name_len;
-
- /* PATH_TRANSLATED should be defined at this stage but better safe than sorry :) */
- if (!SG(request_info).path_translated) {
- return FAILURE;
- }
-
- if (php_ini_has_per_host_config()) {
- /* Activate per-host-system-configuration defined in php.ini and stored into configuration_hash during startup */
- server_name = sapi_cgibin_getenv("SERVER_NAME", sizeof("SERVER_NAME") - 1 TSRMLS_CC);
- /* SERVER_NAME should also be defined at this stage..but better check it anyway */
- if (server_name) {
- server_name_len = strlen(server_name);
- server_name = estrndup(server_name, server_name_len);
- zend_str_tolower(server_name, server_name_len);
- php_ini_activate_per_host_config(server_name, server_name_len + 1 TSRMLS_CC);
- efree(server_name);
- }
- }
-
- if (php_ini_has_per_dir_config() ||
- (PG(user_ini_filename) && *PG(user_ini_filename))
- ) {
- /* Prepare search path */
- path_len = strlen(SG(request_info).path_translated);
-
- /* Make sure we have trailing slash! */
- if (!IS_SLASH(SG(request_info).path_translated[path_len])) {
- path = emalloc(path_len + 2);
- memcpy(path, SG(request_info).path_translated, path_len + 1);
- path_len = zend_dirname(path, path_len);
- path[path_len++] = DEFAULT_SLASH;
- } else {
- path = estrndup(SG(request_info).path_translated, path_len);
- path_len = zend_dirname(path, path_len);
- }
- path[path_len] = 0;
-
- /* Activate per-dir-system-configuration defined in php.ini and stored into configuration_hash during startup */
- php_ini_activate_per_dir_config(path, path_len TSRMLS_CC); /* Note: for global settings sake we check from root to path */
-
- /* Load and activate user ini files in path starting from DOCUMENT_ROOT */
- if (PG(user_ini_filename) && *PG(user_ini_filename)) {
- doc_root = sapi_cgibin_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT") - 1 TSRMLS_CC);
- /* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */
- if (doc_root) {
- doc_root_len = strlen(doc_root);
- if (doc_root_len > 0 && IS_SLASH(doc_root[doc_root_len - 1])) {
- --doc_root_len;
- }
-#ifdef PHP_WIN32
- /* paths on windows should be case-insensitive */
- doc_root = estrndup(doc_root, doc_root_len);
- zend_str_tolower(doc_root, doc_root_len);
-#endif
- php_cgi_ini_activate_user_config(path, path_len, doc_root, doc_root_len, doc_root_len - 1 TSRMLS_CC);
- }
- }
-
-#ifdef PHP_WIN32
- efree(doc_root);
-#endif
- efree(path);
- }
-
- return SUCCESS;
-}
-
-static int sapi_cgi_deactivate(TSRMLS_D)
-{
- /* flush only when SAPI was started. The reasons are:
- 1. SAPI Deactivate is called from two places: module init and request shutdown
- 2. When the first call occurs and the request is not set up, flush fails on FastCGI.
- */
- if (SG(sapi_started)) {
- if (fcgi_is_fastcgi()) {
- if (
-#ifndef PHP_WIN32
- !parent &&
-#endif
- !fcgi_finish_request((fcgi_request*)SG(server_context), 0)) {
- php_handle_aborted_connection();
- }
- } else {
- sapi_cgibin_flush(SG(server_context));
- }
- }
- return SUCCESS;
-}
-
-static int php_cgi_startup(sapi_module_struct *sapi_module)
-{
- if (php_module_startup(sapi_module, &cgi_module_entry, 1) == FAILURE) {
- return FAILURE;
- }
- return SUCCESS;
-}
-
-/* {{{ sapi_module_struct cgi_sapi_module
- */
-static sapi_module_struct cgi_sapi_module = {
- "fpm-fcgi", /* name */
- "FPM/FastCGI", /* pretty name */
-
- php_cgi_startup, /* startup */
- php_module_shutdown_wrapper, /* shutdown */
-
- sapi_cgi_activate, /* activate */
- sapi_cgi_deactivate, /* deactivate */
-
- sapi_cgibin_ub_write, /* unbuffered write */
- sapi_cgibin_flush, /* flush */
- NULL, /* get uid */
- sapi_cgibin_getenv, /* getenv */
-
- php_error, /* error handler */
-
- NULL, /* header handler */
- sapi_cgi_send_headers, /* send headers handler */
- NULL, /* send header handler */
-
- sapi_cgi_read_post, /* read POST data */
- sapi_cgi_read_cookies, /* read Cookies */
-
- sapi_cgi_register_variables, /* register server variables */
- sapi_cgi_log_message, /* Log message */
- NULL, /* Get request time */
- NULL, /* Child terminate */
-
- STANDARD_SAPI_MODULE_PROPERTIES
-};
-/* }}} */
-
-/* {{{ arginfo ext/standard/dl.c */
-ZEND_BEGIN_ARG_INFO(arginfo_dl, 0)
- ZEND_ARG_INFO(0, extension_filename)
-ZEND_END_ARG_INFO()
-/* }}} */
-
-static const zend_function_entry additional_functions[] = {
- ZEND_FE(dl, arginfo_dl)
- {NULL, NULL, NULL}
-};
-
-/* {{{ php_cgi_usage
- */
-static void php_cgi_usage(char *argv0)
-{
- char *prog;
-
- prog = strrchr(argv0, '/');
- if (prog) {
- prog++;
- } else {
- prog = "php";
- }
-
- php_printf( "Usage: %s [-q] [-h] [-s] [-v] [-i] [-f <file>]\n"
- " %s <file> [args...]\n"
- " -a Run interactively\n"
- " -b <address:port>|<port> Bind Path for external FASTCGI Server mode\n"
- " -C Do not chdir to the script's directory\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"
- " -e Generate extended information for debugger/profiler\n"
- " -f <file> Parse <file>. Implies `-q'\n"
- " -h This help\n"
- " -i PHP information\n"
- " -l Syntax check only (lint)\n"
- " -m Show compiled in modules\n"
- " -q Quiet-mode. Suppress HTTP Header output.\n"
- " -s Display colour syntax highlighted source.\n"
- " -v Version number\n"
- " -w Display source with stripped comments and whitespace.\n"
- " -z <file> Load Zend extension <file>.\n"
- " -T <count> Measure execution time of script repeated <count> times.\n",
- prog, prog);
-}
-/* }}} */
-
-/* {{{ is_valid_path
- *
- * some server configurations allow '..' to slip through in the
- * translated path. We'll just refuse to handle such a path.
- */
-static int is_valid_path(const char *path)
-{
- const char *p;
-
- if (!path) {
- return 0;
- }
- p = strstr(path, "..");
- if (p) {
- if ((p == path || IS_SLASH(*(p-1))) &&
- (*(p+2) == 0 || IS_SLASH(*(p+2)))
- ) {
- return 0;
- }
- while (1) {
- p = strstr(p+1, "..");
- if (!p) {
- break;
- }
- if (IS_SLASH(*(p-1)) &&
- (*(p+2) == 0 || IS_SLASH(*(p+2)))
- ) {
- return 0;
- }
- }
- }
- return 1;
-}
-/* }}} */
-
-/* {{{ init_request_info
-
- initializes request_info structure
-
- specificly in this section we handle proper translations
- for:
-
- PATH_INFO
- derived from the portion of the URI path following
- the script name but preceding any query data
- may be empty
-
- PATH_TRANSLATED
- derived by taking any path-info component of the
- request URI and performing any virtual-to-physical
- translation appropriate to map it onto the server's
- document repository structure
-
- empty if PATH_INFO is empty
-
- The env var PATH_TRANSLATED **IS DIFFERENT** than the
- request_info.path_translated variable, the latter should
- match SCRIPT_FILENAME instead.
-
- SCRIPT_NAME
- set to a URL path that could identify the CGI script
- rather than the interpreter. PHP_SELF is set to this
-
- REQUEST_URI
- uri section following the domain:port part of a URI
-
- SCRIPT_FILENAME
- The virtual-to-physical translation of SCRIPT_NAME (as per
- PATH_TRANSLATED)
-
- These settings are documented at
- http://cgi-spec.golux.com/
-
-
- Based on the following URL request:
-
- http://localhost/info.php/test?a=b
-
- should produce, which btw is the same as if
- we were running under mod_cgi on apache (ie. not
- using ScriptAlias directives):
-
- PATH_INFO=/test
- PATH_TRANSLATED=/docroot/test
- SCRIPT_NAME=/info.php
- REQUEST_URI=/info.php/test?a=b
- SCRIPT_FILENAME=/docroot/info.php
- QUERY_STRING=a=b
-
- but what we get is (cgi/mod_fastcgi under apache):
-
- PATH_INFO=/info.php/test
- PATH_TRANSLATED=/docroot/info.php/test
- SCRIPT_NAME=/php/php-cgi (from the Action setting I suppose)
- REQUEST_URI=/info.php/test?a=b
- SCRIPT_FILENAME=/path/to/php/bin/php-cgi (Action setting translated)
- QUERY_STRING=a=b
-
- Comments in the code below refer to using the above URL in a request
-
- */
-static void init_request_info(TSRMLS_D)
-{
- char *env_script_filename = sapi_cgibin_getenv("SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME")-1 TSRMLS_CC);
- char *env_path_translated = sapi_cgibin_getenv("PATH_TRANSLATED", sizeof("PATH_TRANSLATED")-1 TSRMLS_CC);
- char *script_path_translated = env_script_filename;
-
- /* some broken servers do not have script_filename or argv0
- * an example, IIS configured in some ways. then they do more
- * broken stuff and set path_translated to the cgi script location */
- if (!script_path_translated && env_path_translated) {
- script_path_translated = env_path_translated;
- }
-
- /* initialize the defaults */
- SG(request_info).path_translated = NULL;
- SG(request_info).request_method = NULL;
- SG(request_info).proto_num = 1000;
- SG(request_info).query_string = NULL;
- SG(request_info).request_uri = NULL;
- SG(request_info).content_type = NULL;
- SG(request_info).content_length = 0;
- SG(sapi_headers).http_response_code = 200;
-
- /* script_path_translated being set is a good indication that
- * we are running in a cgi environment, since it is always
- * null otherwise. otherwise, the filename
- * of the script will be retreived later via argc/argv */
- if (script_path_translated) {
- const char *auth;
- char *content_length = sapi_cgibin_getenv("CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1 TSRMLS_CC);
- char *content_type = sapi_cgibin_getenv("CONTENT_TYPE", sizeof("CONTENT_TYPE")-1 TSRMLS_CC);
- char *env_path_info = sapi_cgibin_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
- char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1 TSRMLS_CC);
-
- /* Hack for buggy IIS that sets incorrect PATH_INFO */
- char *env_server_software = sapi_cgibin_getenv("SERVER_SOFTWARE", sizeof("SERVER_SOFTWARE")-1 TSRMLS_CC);
- if (env_server_software &&
- env_script_name &&
- env_path_info &&
- strncmp(env_server_software, "Microsoft-IIS", sizeof("Microsoft-IIS")-1) == 0 &&
- strncmp(env_path_info, env_script_name, strlen(env_script_name)) == 0
- ) {
- env_path_info = _sapi_cgibin_putenv("ORIG_PATH_INFO", env_path_info TSRMLS_CC);
- env_path_info += strlen(env_script_name);
- if (*env_path_info == 0) {
- env_path_info = NULL;
- }
- env_path_info = _sapi_cgibin_putenv("PATH_INFO", env_path_info TSRMLS_CC);
- }
-
- if (CGIG(fix_pathinfo)) {
- struct stat st;
- char *real_path = NULL;
- char *env_redirect_url = sapi_cgibin_getenv("REDIRECT_URL", sizeof("REDIRECT_URL")-1 TSRMLS_CC);
- char *env_document_root = sapi_cgibin_getenv("DOCUMENT_ROOT", sizeof("DOCUMENT_ROOT")-1 TSRMLS_CC);
- char *orig_path_translated = env_path_translated;
- char *orig_path_info = env_path_info;
- char *orig_script_name = env_script_name;
- char *orig_script_filename = env_script_filename;
- int script_path_translated_len;
-
- if (!env_document_root && PG(doc_root)) {
- env_document_root = _sapi_cgibin_putenv("DOCUMENT_ROOT", PG(doc_root) TSRMLS_CC);
- /* fix docroot */
- TRANSLATE_SLASHES(env_document_root);
- }
-
- if (env_path_translated != NULL && env_redirect_url != NULL &&
- env_path_translated != script_path_translated &&
- strcmp(env_path_translated, script_path_translated) != 0) {
- /*
- * pretty much apache specific. If we have a redirect_url
- * then our script_filename and script_name point to the
- * php executable
- */
- script_path_translated = env_path_translated;
- /* we correct SCRIPT_NAME now in case we don't have PATH_INFO */
- env_script_name = env_redirect_url;
- }
-
-#ifdef __riscos__
- /* Convert path to unix format*/
- __riscosify_control |= __RISCOSIFY_DONT_CHECK_DIR;
- script_path_translated = __unixify(script_path_translated, 0, NULL, 1, 0);
-#endif
-
- /*
- * if the file doesn't exist, try to extract PATH_INFO out
- * of it by stat'ing back through the '/'
- * this fixes url's like /info.php/test
- */
- if (script_path_translated &&
- (script_path_translated_len = strlen(script_path_translated)) > 0 &&
- (script_path_translated[script_path_translated_len-1] == '/' ||
-#ifdef PHP_WIN32
- script_path_translated[script_path_translated_len-1] == '\\' ||
-#endif
- (real_path = tsrm_realpath(script_path_translated, NULL TSRMLS_CC)) == NULL)
- ) {
- char *pt = estrndup(script_path_translated, script_path_translated_len);
- int len = script_path_translated_len;
- char *ptr;
-
- while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
- *ptr = 0;
- if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
- /*
- * okay, we found the base script!
- * work out how many chars we had to strip off;
- * then we can modify PATH_INFO
- * accordingly
- *
- * we now have the makings of
- * PATH_INFO=/test
- * SCRIPT_FILENAME=/docroot/info.php
- *
- * we now need to figure out what docroot is.
- * if DOCUMENT_ROOT is set, this is easy, otherwise,
- * we have to play the game of hide and seek to figure
- * out what SCRIPT_NAME should be
- */
- int slen = len - strlen(pt);
- int pilen = env_path_info ? strlen(env_path_info) : 0;
- char *path_info = env_path_info ? env_path_info + pilen - slen : NULL;
-
- if (orig_path_info != path_info) {
- if (orig_path_info) {
- char old;
-
- _sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
- old = path_info[0];
- path_info[0] = 0;
- if (!orig_script_name ||
- strcmp(orig_script_name, env_path_info) != 0) {
- if (orig_script_name) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
- }
- SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
- } else {
- SG(request_info).request_uri = orig_script_name;
- }
- path_info[0] = old;
- }
- env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
- }
- if (!orig_script_filename ||
- strcmp(orig_script_filename, pt) != 0) {
- if (orig_script_filename) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
- }
- script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
- }
- TRANSLATE_SLASHES(pt);
-
- /* figure out docroot
- * SCRIPT_FILENAME minus SCRIPT_NAME
- */
- if (env_document_root) {
- int l = strlen(env_document_root);
- int path_translated_len = 0;
- char *path_translated = NULL;
-
- if (l && env_document_root[l - 1] == '/') {
- --l;
- }
-
- /* we have docroot, so we should have:
- * DOCUMENT_ROOT=/docroot
- * SCRIPT_FILENAME=/docroot/info.php
- */
-
- /* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
- path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
- path_translated = (char *) emalloc(path_translated_len + 1);
- memcpy(path_translated, env_document_root, l);
- if (env_path_info) {
- memcpy(path_translated + l, env_path_info, (path_translated_len - l));
- }
- path_translated[path_translated_len] = '\0';
- if (orig_path_translated) {
- _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
- }
- env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
- efree(path_translated);
- } else if ( env_script_name &&
- strstr(pt, env_script_name)
- ) {
- /* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
- int ptlen = strlen(pt) - strlen(env_script_name);
- int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
- char *path_translated = NULL;
-
- path_translated = (char *) emalloc(path_translated_len + 1);
- memcpy(path_translated, pt, ptlen);
- if (env_path_info) {
- memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
- }
- path_translated[path_translated_len] = '\0';
- if (orig_path_translated) {
- _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
- }
- env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
- efree(path_translated);
- }
- break;
- }
- }
- if (!ptr) {
- /*
- * if we stripped out all the '/' and still didn't find
- * a valid path... we will fail, badly. of course we would
- * have failed anyway... we output 'no input file' now.
- */
- if (orig_script_filename) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
- }
- script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", NULL TSRMLS_CC);
- SG(sapi_headers).http_response_code = 404;
- }
- if (!SG(request_info).request_uri) {
- if (!orig_script_name ||
- strcmp(orig_script_name, env_script_name) != 0) {
- if (orig_script_name) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
- }
- SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC);
- } else {
- SG(request_info).request_uri = orig_script_name;
- }
- }
- if (pt) {
- efree(pt);
- }
- } else {
- /* make sure path_info/translated are empty */
- if (!orig_script_filename ||
- (script_path_translated != orig_script_filename &&
- strcmp(script_path_translated, orig_script_filename) != 0)) {
- if (orig_script_filename) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
- }
- script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", script_path_translated TSRMLS_CC);
- }
- if (env_redirect_url) {
- if (orig_path_info) {
- _sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
- _sapi_cgibin_putenv("PATH_INFO", NULL TSRMLS_CC);
- }
- if (orig_path_translated) {
- _sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
- _sapi_cgibin_putenv("PATH_TRANSLATED", NULL TSRMLS_CC);
- }
- }
- if (env_script_name != orig_script_name) {
- if (orig_script_name) {
- _sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
- }
- SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_script_name TSRMLS_CC);
- } else {
- SG(request_info).request_uri = env_script_name;
- }
- free(real_path);
- }
- } else {
- /* pre 4.3 behaviour, shouldn't be used but provides BC */
- if (env_path_info) {
- SG(request_info).request_uri = env_path_info;
- } else {
- SG(request_info).request_uri = env_script_name;
- }
- if (!CGIG(discard_path) && env_path_translated) {
- script_path_translated = env_path_translated;
- }
- }
-
- if (is_valid_path(script_path_translated)) {
- SG(request_info).path_translated = estrdup(script_path_translated);
- }
-
- SG(request_info).request_method = sapi_cgibin_getenv("REQUEST_METHOD", sizeof("REQUEST_METHOD")-1 TSRMLS_CC);
- /* FIXME - Work out proto_num here */
- SG(request_info).query_string = sapi_cgibin_getenv("QUERY_STRING", sizeof("QUERY_STRING")-1 TSRMLS_CC);
- SG(request_info).content_type = (content_type ? content_type : "" );
- SG(request_info).content_length = (content_length ? atoi(content_length) : 0);
-
- /* The CGI RFC allows servers to pass on unvalidated Authorization data */
- auth = sapi_cgibin_getenv("HTTP_AUTHORIZATION", sizeof("HTTP_AUTHORIZATION")-1 TSRMLS_CC);
- php_handle_auth_data(auth TSRMLS_CC);
- }
-}
-/* }}} */
-
-#ifndef PHP_WIN32
-/**
- * Clean up child processes upon exit
- */
-void fastcgi_cleanup(int signal)
-{
-#ifdef DEBUG_FASTCGI
- fprintf(stderr, "FastCGI shutdown, pid %d\n", getpid());
-#endif
-
- sigaction(SIGTERM, &old_term, 0);
-
- /* Kill all the processes in our process group */
- kill(-pgroup, SIGTERM);
-
- if (parent && parent_waiting) {
- exit_signal = 1;
- } else {
- exit(0);
- }
-}
-#endif
-
-PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("cgi.rfc2616_headers", "0", PHP_INI_ALL, OnUpdateBool, rfc2616_headers, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.nph", "0", PHP_INI_ALL, OnUpdateBool, nph, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.check_shebang_line", "1", PHP_INI_SYSTEM, OnUpdateBool, check_shebang_line, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.force_redirect", "1", PHP_INI_SYSTEM, OnUpdateBool, force_redirect, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.redirect_status_env", NULL, PHP_INI_SYSTEM, OnUpdateString, redirect_status_env, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.fix_pathinfo", "1", PHP_INI_SYSTEM, OnUpdateBool, fix_pathinfo, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("cgi.discard_path", "0", PHP_INI_SYSTEM, OnUpdateBool, discard_path, php_cgi_globals_struct, php_cgi_globals)
- STD_PHP_INI_ENTRY("fastcgi.logging", "1", PHP_INI_SYSTEM, OnUpdateBool, fcgi_logging, php_cgi_globals_struct, php_cgi_globals)
-#ifdef PHP_WIN32
- STD_PHP_INI_ENTRY("fastcgi.impersonate", "0", PHP_INI_SYSTEM, OnUpdateBool, impersonate, php_cgi_globals_struct, php_cgi_globals)
-#endif
-PHP_INI_END()
-
-/* {{{ php_cgi_globals_ctor
- */
-static void php_cgi_globals_ctor(php_cgi_globals_struct *php_cgi_globals TSRMLS_DC)
-{
- php_cgi_globals->rfc2616_headers = 0;
- php_cgi_globals->nph = 0;
- php_cgi_globals->check_shebang_line = 1;
- php_cgi_globals->force_redirect = 1;
- php_cgi_globals->redirect_status_env = NULL;
- php_cgi_globals->fix_pathinfo = 1;
- php_cgi_globals->discard_path = 0;
- php_cgi_globals->fcgi_logging = 1;
-#ifdef PHP_WIN32
- php_cgi_globals->impersonate = 0;
-#endif
- zend_hash_init(&php_cgi_globals->user_config_cache, 0, NULL, (dtor_func_t) user_config_cache_entry_dtor, 1);
-}
-/* }}} */
-
-/* {{{ PHP_MINIT_FUNCTION
- */
-static PHP_MINIT_FUNCTION(cgi)
-{
-#ifdef ZTS
- ts_allocate_id(&php_cgi_globals_id, sizeof(php_cgi_globals_struct), (ts_allocate_ctor) php_cgi_globals_ctor, NULL);
-#else
- php_cgi_globals_ctor(&php_cgi_globals TSRMLS_CC);
-#endif
- REGISTER_INI_ENTRIES();
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MSHUTDOWN_FUNCTION
- */
-static PHP_MSHUTDOWN_FUNCTION(cgi)
-{
- zend_hash_destroy(&CGIG(user_config_cache));
-
- UNREGISTER_INI_ENTRIES();
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_MINFO_FUNCTION
- */
-static PHP_MINFO_FUNCTION(cgi)
-{
- DISPLAY_INI_ENTRIES();
-}
-/* }}} */
-
-static zend_module_entry cgi_module_entry = {
- STANDARD_MODULE_HEADER,
- "cgi-fcgi",
- NULL,
- PHP_MINIT(cgi),
- PHP_MSHUTDOWN(cgi),
- NULL,
- NULL,
- PHP_MINFO(cgi),
- NO_VERSION_YET,
- STANDARD_MODULE_PROPERTIES
-};
-
-/* {{{ main
- */
-int main(int argc, char *argv[])
-{
- int free_query_string = 0;
- int exit_status = SUCCESS;
- int cgi = 0, c, i, len;
- zend_file_handle file_handle;
- char *s;
-
- /* temporary locals */
- int behavior = PHP_MODE_STANDARD;
- int no_headers = 0;
- int orig_optind = php_optind;
- char *orig_optarg = php_optarg;
- char *script_file = NULL;
- int ini_entries_len = 0;
- /* end of temporary locals */
-
-#ifdef ZTS
- void ***tsrm_ls;
-#endif
-
- int max_requests = 500;
- int requests = 0;
- int fastcgi = fcgi_is_fastcgi();
- char *bindpath = NULL;
- int fcgi_fd = 0;
- fcgi_request request;
- int repeats = 1;
- int benchmark = 0;
-#if HAVE_GETTIMEOFDAY
- struct timeval start, end;
-#else
- time_t start, end;
-#endif
-#ifndef PHP_WIN32
- int status = 0;
-#endif
-
-#if 0 && defined(PHP_DEBUG)
- /* IIS is always making things more difficult. This allows
- * us to stop PHP and attach a debugger before much gets started */
- {
- char szMessage [256];
- wsprintf (szMessage, "Please attach a debugger to the process 0x%X [%d] (%s) and click OK", GetCurrentProcessId(), GetCurrentProcessId(), argv[0]);
- MessageBox(NULL, szMessage, "CGI Debug Time!", MB_OK|MB_SERVICE_NOTIFICATION);
- }
-#endif
-
-#ifdef HAVE_SIGNAL_H
-#if defined(SIGPIPE) && defined(SIG_IGN)
- signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE in standalone mode so
- that sockets created via fsockopen()
- don't kill PHP if the remote site
- closes it. in apache|apxs mode apache
- does that for us! thies@thieso.net
- 20000419 */
-#endif
-#endif
-
-#ifdef ZTS
- tsrm_startup(1, 1, 0, NULL);
- tsrm_ls = ts_resource(0);
-#endif
-
- sapi_startup(&cgi_sapi_module);
- cgi_sapi_module.php_ini_path_override = NULL;
-
-#ifdef PHP_WIN32
- _fmode = _O_BINARY; /* sets default for file streams to binary */
- setmode(_fileno(stdin), O_BINARY); /* make the stdio mode be binary */
- setmode(_fileno(stdout), O_BINARY); /* make the stdio mode be binary */
- setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
-#endif
-
- if (!fastcgi) {
- /* Make sure we detect we are a cgi - a bit redundancy here,
- * but the default case is that we have to check only the first one. */
- if (getenv("SERVER_SOFTWARE") ||
- getenv("SERVER_NAME") ||
- getenv("GATEWAY_INTERFACE") ||
- getenv("REQUEST_METHOD")
- ) {
- cgi = 1;
- }
- }
-
- while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
- switch (c) {
- case 'c':
- if (cgi_sapi_module.php_ini_path_override) {
- free(cgi_sapi_module.php_ini_path_override);
- }
- cgi_sapi_module.php_ini_path_override = strdup(php_optarg);
- break;
- case 'n':
- cgi_sapi_module.php_ini_ignore = 1;
- break;
- case 'd': {
- /* define ini entries on command line */
- int len = strlen(php_optarg);
- char *val;
-
- if ((val = strchr(php_optarg, '='))) {
- val++;
- if (!isalnum(*val) && *val != '"' && *val != '\'' && *val != '\0') {
- cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("\"\"\n\0"));
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, (val - php_optarg));
- ini_entries_len += (val - php_optarg);
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, "\"", 1);
- ini_entries_len++;
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, val, len - (val - php_optarg));
- ini_entries_len += len - (val - php_optarg);
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, "\"\n\0", sizeof("\"\n\0"));
- ini_entries_len += sizeof("\n\0\"") - 2;
- } else {
- cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("\n\0"));
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, "\n\0", sizeof("\n\0"));
- ini_entries_len += len + sizeof("\n\0") - 2;
- }
- } else {
- cgi_sapi_module.ini_entries = realloc(cgi_sapi_module.ini_entries, ini_entries_len + len + sizeof("=1\n\0"));
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len, php_optarg, len);
- memcpy(cgi_sapi_module.ini_entries + ini_entries_len + len, "=1\n\0", sizeof("=1\n\0"));
- ini_entries_len += len + sizeof("=1\n\0") - 2;
- }
- break;
- }
- /* if we're started on command line, check to see if
- * we are being started as an 'external' fastcgi
- * server by accepting a bindpath parameter. */
- case 'b':
- if (!fastcgi) {
- bindpath = strdup(php_optarg);
- }
- break;
- case 's': /* generate highlighted HTML from source */
- behavior = PHP_MODE_HIGHLIGHT;
- break;
- }
- }
- php_optind = orig_optind;
- php_optarg = orig_optarg;
-
-#ifdef ZTS
- SG(request_info).path_translated = NULL;
-#endif
-
- cgi_sapi_module.executable_location = argv[0];
- if (!cgi && !fastcgi && !bindpath) {
- cgi_sapi_module.additional_functions = additional_functions;
- }
-
- /* startup after we get the above ini override se we get things right */
- if (cgi_sapi_module.startup(&cgi_sapi_module) == FAILURE) {
-#ifdef ZTS
- tsrm_shutdown();
-#endif
- return FAILURE;
- }
-
- /* check force_cgi after startup, so we have proper output */
- if (cgi && CGIG(force_redirect)) {
- /* Apache will generate REDIRECT_STATUS,
- * Netscape and redirect.so will generate HTTP_REDIRECT_STATUS.
- * redirect.so and installation instructions available from
- * http://www.koehntopp.de/php.
- * -- kk@netuse.de
- */
- if (!getenv("REDIRECT_STATUS") &&
- !getenv ("HTTP_REDIRECT_STATUS") &&
- /* this is to allow a different env var to be configured
- * in case some server does something different than above */
- (!CGIG(redirect_status_env) || !getenv(CGIG(redirect_status_env)))
- ) {
- zend_try {
- SG(sapi_headers).http_response_code = 400;
- PUTS("<b>Security Alert!</b> The PHP CGI cannot be accessed directly.\n\n\
-<p>This PHP CGI binary was compiled with force-cgi-redirect enabled. This\n\
-means that a page will only be served up if the REDIRECT_STATUS CGI variable is\n\
-set, e.g. via an Apache Action directive.</p>\n\
-<p>For more information as to <i>why</i> this behaviour exists, see the <a href=\"http://php.net/security.cgi-bin\">\
-manual page for CGI security</a>.</p>\n\
-<p>For more information about changing this behaviour or re-enabling this webserver,\n\
-consult the installation file that came with this distribution, or visit \n\
-<a href=\"http://php.net/install.windows\">the manual page</a>.</p>\n");
- } zend_catch {
- } zend_end_try();
-#if defined(ZTS) && !defined(PHP_DEBUG)
- /* XXX we're crashing here in msvc6 debug builds at
- * php_message_handler_for_zend:839 because
- * SG(request_info).path_translated is an invalid pointer.
- * It still happens even though I set it to null, so something
- * weird is going on.
- */
- tsrm_shutdown();
-#endif
- return FAILURE;
- }
- }
-
- if (bindpath) {
- fcgi_fd = fcgi_listen(bindpath, 128);
- if (fcgi_fd < 0) {
- fprintf(stderr, "Couldn't create FastCGI listen socket on port %s\n", bindpath);
-#ifdef ZTS
- tsrm_shutdown();
-#endif
- return FAILURE;
- }
- fastcgi = fcgi_is_fastcgi();
- }
- if (fastcgi) {
- /* How many times to run PHP scripts before dying */
- if (getenv("PHP_FCGI_MAX_REQUESTS")) {
- max_requests = atoi(getenv("PHP_FCGI_MAX_REQUESTS"));
- if (max_requests < 0) {
- fprintf(stderr, "PHP_FCGI_MAX_REQUESTS is not valid\n");
- return FAILURE;
- }
- }
-
- /* make php call us to get _ENV vars */
- php_php_import_environment_variables = php_import_environment_variables;
- php_import_environment_variables = cgi_php_import_environment_variables;
-
- /* library is already initialized, now init our request */
- fcgi_init_request(&request, fcgi_fd);
-
-#ifndef PHP_WIN32
- /* Pre-fork, if required */
- if (getenv("PHP_FCGI_CHILDREN")) {
- char * children_str = getenv("PHP_FCGI_CHILDREN");
- children = atoi(children_str);
- if (children < 0) {
- fprintf(stderr, "PHP_FCGI_CHILDREN is not valid\n");
- return FAILURE;
- }
- fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, children_str, strlen(children_str));
- /* This is the number of concurrent requests, equals FCGI_MAX_CONNS */
- fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, children_str, strlen(children_str));
- } else {
- fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, "1", sizeof("1")-1);
- fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, "1", sizeof("1")-1);
- }
-
- if (children) {
- int running = 0;
- pid_t pid;
-
- /* Create a process group for ourself & children */
- setsid();
- pgroup = getpgrp();
-#ifdef DEBUG_FASTCGI
- fprintf(stderr, "Process group %d\n", pgroup);
-#endif
-
- /* Set up handler to kill children upon exit */
- act.sa_flags = 0;
- act.sa_handler = fastcgi_cleanup;
- if (sigaction(SIGTERM, &act, &old_term) ||
- sigaction(SIGINT, &act, &old_int) ||
- sigaction(SIGQUIT, &act, &old_quit)
- ) {
- perror("Can't set signals");
- exit(1);
- }
-
- if (fcgi_in_shutdown()) {
- goto parent_out;
- }
-
- while (parent) {
- do {
-#ifdef DEBUG_FASTCGI
- fprintf(stderr, "Forking, %d running\n", running);
-#endif
- pid = fork();
- switch (pid) {
- case 0:
- /* One of the children.
- * Make sure we don't go round the
- * fork loop any more
- */
- parent = 0;
-
- /* don't catch our signals */
- sigaction(SIGTERM, &old_term, 0);
- sigaction(SIGQUIT, &old_quit, 0);
- sigaction(SIGINT, &old_int, 0);
- break;
- case -1:
- perror("php (pre-forking)");
- exit(1);
- break;
- default:
- /* Fine */
- running++;
- break;
- }
- } while (parent && (running < children));
-
- if (parent) {
-#ifdef DEBUG_FASTCGI
- fprintf(stderr, "Wait for kids, pid %d\n", getpid());
-#endif
- parent_waiting = 1;
- while (1) {
- if (wait(&status) >= 0) {
- running--;
- break;
- } else if (exit_signal) {
- break;
- }
- }
- if (exit_signal) {
-#if 0
- while (running > 0) {
- while (wait(&status) < 0) {
- }
- running--;
- }
-#endif
- goto parent_out;
- }
- }
- }
- } else {
- parent = 0;
- }
-
-#endif /* WIN32 */
- }
-
- zend_first_try {
- while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
- switch (c) {
- case 'T':
- benchmark = 1;
- repeats = atoi(php_optarg);
-#ifdef HAVE_GETTIMEOFDAY
- gettimeofday(&start, NULL);
-#else
- time(&start);
-#endif
- break;
- case 'h':
- case '?':
- fcgi_shutdown();
- no_headers = 1;
- php_output_startup();
- php_output_activate(TSRMLS_C);
- SG(headers_sent) = 1;
- php_cgi_usage(argv[0]);
- php_end_ob_buffers(1 TSRMLS_CC);
- exit_status = 0;
- goto out;
- }
- }
- php_optind = orig_optind;
- php_optarg = orig_optarg;
-
- /* start of FAST CGI loop */
- /* Initialise FastCGI request structure */
-#ifdef PHP_WIN32
- /* attempt to set security impersonation for fastcgi
- * will only happen on NT based OS, others will ignore it. */
- if (fastcgi && CGIG(impersonate)) {
- fcgi_impersonate();
- }
-#endif
- while (!fastcgi || fcgi_accept_request(&request) >= 0) {
- SG(server_context) = (void *) &request;
- init_request_info(TSRMLS_C);
- CG(interactive) = 0;
-
- if (!cgi && !fastcgi) {
- while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
- switch (c) {
-
- case 'a': /* interactive mode */
- printf("Interactive mode enabled\n\n");
- CG(interactive) = 1;
- break;
-
- case 'C': /* don't chdir to the script directory */
- SG(options) |= SAPI_OPTION_NO_CHDIR;
- break;
-
- case 'e': /* enable extended info output */
- CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
- break;
-
- case 'f': /* parse file */
- if (script_file) {
- efree(script_file);
- }
- script_file = estrdup(php_optarg);
- no_headers = 1;
- break;
-
- case 'i': /* php info & quit */
- if (script_file) {
- efree(script_file);
- }
- if (php_request_startup(TSRMLS_C) == FAILURE) {
- SG(server_context) = NULL;
- php_module_shutdown(TSRMLS_C);
- return FAILURE;
- }
- if (no_headers) {
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
- }
- php_print_info(0xFFFFFFFF TSRMLS_CC);
- php_request_shutdown((void *) 0);
- exit_status = 0;
- goto out;
-
- case 'l': /* syntax check mode */
- no_headers = 1;
- behavior = PHP_MODE_LINT;
- break;
-
- case 'm': /* list compiled in modules */
- if (script_file) {
- efree(script_file);
- }
- php_output_startup();
- php_output_activate(TSRMLS_C);
- SG(headers_sent) = 1;
- php_printf("[PHP Modules]\n");
- print_modules(TSRMLS_C);
- php_printf("\n[Zend Modules]\n");
- print_extensions(TSRMLS_C);
- php_printf("\n");
- php_end_ob_buffers(1 TSRMLS_CC);
- exit_status = 0;
- goto out;
-
-#if 0 /* not yet operational, see also below ... */
- case '': /* generate indented source mode*/
- behavior=PHP_MODE_INDENT;
- break;
-#endif
-
- case 'q': /* do not generate HTTP headers */
- no_headers = 1;
- break;
-
- case 'v': /* show php version & quit */
- if (script_file) {
- efree(script_file);
- }
- no_headers = 1;
- if (php_request_startup(TSRMLS_C) == FAILURE) {
- SG(server_context) = NULL;
- php_module_shutdown(TSRMLS_C);
- return FAILURE;
- }
- if (no_headers) {
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
- }
-#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-#endif
- php_request_shutdown((void *) 0);
- exit_status = 0;
- goto out;
-
- case 'w':
- behavior = PHP_MODE_STRIP;
- break;
-
- case 'z': /* load extension file */
- zend_load_extension(php_optarg);
- break;
-
- default:
- break;
- }
- }
-
- if (script_file) {
- /* override path_translated if -f on command line */
- STR_FREE(SG(request_info).path_translated);
- SG(request_info).path_translated = script_file;
- /* before registering argv to module exchange the *new* argv[0] */
- /* we can achieve this without allocating more memory */
- SG(request_info).argc = argc - (php_optind - 1);
- SG(request_info).argv = &argv[php_optind - 1];
- SG(request_info).argv[0] = script_file;
- } else if (argc > php_optind) {
- /* file is on command line, but not in -f opt */
- STR_FREE(SG(request_info).path_translated);
- SG(request_info).path_translated = estrdup(argv[php_optind]);
- /* arguments after the file are considered script args */
- SG(request_info).argc = argc - php_optind;
- SG(request_info).argv = &argv[php_optind];
- }
-
- if (no_headers) {
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
- }
-
- /* all remaining arguments are part of the query string
- * this section of code concatenates all remaining arguments
- * into a single string, seperating args with a &
- * this allows command lines like:
- *
- * test.php v1=test v2=hello+world!
- * test.php "v1=test&v2=hello world!"
- * test.php v1=test "v2=hello world!"
- */
- if (!SG(request_info).query_string && argc > php_optind) {
- int slen = strlen(PG(arg_separator).input);
- len = 0;
- for (i = php_optind; i < argc; i++) {
- if (i < (argc - 1)) {
- len += strlen(argv[i]) + slen;
- } else {
- len += strlen(argv[i]);
- }
- }
-
- len += 2;
- s = malloc(len);
- *s = '\0'; /* we are pretending it came from the environment */
- for (i = php_optind; i < argc; i++) {
- strlcat(s, argv[i], len);
- if (i < (argc - 1)) {
- strlcat(s, PG(arg_separator).input, len);
- }
- }
- SG(request_info).query_string = s;
- free_query_string = 1;
- }
- } /* end !cgi && !fastcgi */
-
- /*
- we never take stdin if we're (f)cgi, always
- rely on the web server giving us the info
- we need in the environment.
- */
- if (SG(request_info).path_translated || cgi || fastcgi) {
- file_handle.type = ZEND_HANDLE_FILENAME;
- file_handle.filename = SG(request_info).path_translated;
- file_handle.handle.fp = NULL;
- } else {
- file_handle.filename = "-";
- file_handle.type = ZEND_HANDLE_FP;
- file_handle.handle.fp = stdin;
- }
-
- file_handle.opened_path = NULL;
- file_handle.free_filename = 0;
-
- /* request startup only after we've done all we can to
- * get path_translated */
- if (php_request_startup(TSRMLS_C) == FAILURE) {
- if (fastcgi) {
- fcgi_finish_request(&request, 1);
- }
- SG(server_context) = NULL;
- php_module_shutdown(TSRMLS_C);
- return FAILURE;
- }
- if (no_headers) {
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
- }
-
- /*
- at this point path_translated will be set if:
- 1. we are running from shell and got filename was there
- 2. we are running as cgi or fastcgi
- */
- if (cgi || fastcgi || SG(request_info).path_translated) {
- if (php_fopen_primary_script(&file_handle TSRMLS_CC) == FAILURE) {
- zend_try {
- if (errno == EACCES) {
- SG(sapi_headers).http_response_code = 403;
- PUTS("Access denied.\n");
- } else {
- SG(sapi_headers).http_response_code = 404;
- PUTS("No input file specified.\n");
- }
- } zend_catch {
- } zend_end_try();
- /* we want to serve more requests if this is fastcgi
- * so cleanup and continue, request shutdown is
- * handled later */
- if (fastcgi) {
- goto fastcgi_request_done;
- }
-
- STR_FREE(SG(request_info).path_translated);
-
- if (free_query_string && SG(request_info).query_string) {
- free(SG(request_info).query_string);
- SG(request_info).query_string = NULL;
- }
-
- php_request_shutdown((void *) 0);
- SG(server_context) = NULL;
- php_module_shutdown(TSRMLS_C);
- sapi_shutdown();
-#ifdef ZTS
- tsrm_shutdown();
-#endif
- return FAILURE;
- }
- }
-
- if (CGIG(check_shebang_line) && file_handle.handle.fp && (file_handle.handle.fp != stdin)) {
- /* #!php support */
- c = fgetc(file_handle.handle.fp);
- if (c == '#') {
- while (c != '\n' && c != '\r' && c != EOF) {
- c = fgetc(file_handle.handle.fp); /* skip to end of line */
- }
- /* handle situations where line is terminated by \r\n */
- if (c == '\r') {
- if (fgetc(file_handle.handle.fp) != '\n') {
- long pos = ftell(file_handle.handle.fp);
- fseek(file_handle.handle.fp, pos - 1, SEEK_SET);
- }
- }
- CG(start_lineno) = 2;
- } else {
- rewind(file_handle.handle.fp);
- }
- }
-
- switch (behavior) {
- case PHP_MODE_STANDARD:
- php_execute_script(&file_handle TSRMLS_CC);
- break;
- case PHP_MODE_LINT:
- PG(during_request_startup) = 0;
- exit_status = php_lint_script(&file_handle TSRMLS_CC);
- if (exit_status == SUCCESS) {
- zend_printf("No syntax errors detected in %s\n", file_handle.filename);
- } else {
- zend_printf("Errors parsing %s\n", file_handle.filename);
- }
- break;
- case PHP_MODE_STRIP:
- if (open_file_for_scanning(&file_handle TSRMLS_CC) == SUCCESS) {
- zend_strip(TSRMLS_C);
- zend_file_handle_dtor(&file_handle TSRMLS_CC);
- php_end_ob_buffers(1 TSRMLS_CC);
- }
- return SUCCESS;
- break;
- case PHP_MODE_HIGHLIGHT:
- {
- zend_syntax_highlighter_ini syntax_highlighter_ini;
-
- if (open_file_for_scanning(&file_handle TSRMLS_CC) == SUCCESS) {
- php_get_highlight_struct(&syntax_highlighter_ini);
- zend_highlight(&syntax_highlighter_ini TSRMLS_CC);
- if (fastcgi) {
- goto fastcgi_request_done;
- }
- zend_file_handle_dtor(&file_handle TSRMLS_CC);
- php_end_ob_buffers(1 TSRMLS_CC);
- }
- return SUCCESS;
- }
- break;
-#if 0
- /* Zeev might want to do something with this one day */
- case PHP_MODE_INDENT:
- open_file_for_scanning(&file_handle TSRMLS_CC);
- zend_indent();
- zend_file_handle_dtor(&file_handle TSRMLS_CC);
- return SUCCESS;
- break;
-#endif
- }
-
-fastcgi_request_done:
- {
- STR_FREE(SG(request_info).path_translated);
-
- php_request_shutdown((void *) 0);
-
- if (exit_status == 0) {
- exit_status = EG(exit_status);
- }
-
- if (free_query_string && SG(request_info).query_string) {
- free(SG(request_info).query_string);
- SG(request_info).query_string = NULL;
- }
- }
-
- if (!fastcgi) {
- if (benchmark) {
- repeats--;
- if (repeats > 0) {
- script_file = NULL;
- php_optind = orig_optind;
- php_optarg = orig_optarg;
- continue;
- }
- }
- break;
- }
-
- /* only fastcgi will get here */
- requests++;
- if (max_requests && (requests == max_requests)) {
- fcgi_finish_request(&request, 1);
- if (bindpath) {
- free(bindpath);
- }
- if (max_requests != 1) {
- /* no need to return exit_status of the last request */
- exit_status = 0;
- }
- break;
- }
- /* end of fastcgi loop */
- }
- fcgi_shutdown();
-
- if (cgi_sapi_module.php_ini_path_override) {
- free(cgi_sapi_module.php_ini_path_override);
- }
- if (cgi_sapi_module.ini_entries) {
- free(cgi_sapi_module.ini_entries);
- }
- } zend_catch {
- exit_status = 255;
- } zend_end_try();
-
-out:
- if (benchmark) {
- int sec;
-#ifdef HAVE_GETTIMEOFDAY
- int usec;
-
- gettimeofday(&end, NULL);
- sec = (int)(end.tv_sec - start.tv_sec);
- if (end.tv_usec >= start.tv_usec) {
- usec = (int)(end.tv_usec - start.tv_usec);
- } else {
- sec -= 1;
- usec = (int)(end.tv_usec + 1000000 - start.tv_usec);
- }
- fprintf(stderr, "\nElapsed time: %d.%06d sec\n", sec, usec);
-#else
- time(&end);
- sec = (int)(end - start);
- fprintf(stderr, "\nElapsed time: %d sec\n", sec);
-#endif
- }
-
-#ifndef PHP_WIN32
-parent_out:
-#endif
-
- SG(server_context) = NULL;
- php_module_shutdown(TSRMLS_C);
- sapi_shutdown();
-
-#ifdef ZTS
- tsrm_shutdown();
-#endif
-
-#if defined(PHP_WIN32) && ZEND_DEBUG && 0
- _CrtDumpMemoryLeaks();
-#endif
-
- return exit_status;
-}
-/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c
deleted file mode 100644
index 27e4d8b..0000000
--- a/sapi/fpm/fpm/fpm_php.c
+++ /dev/null
@@ -1,189 +0,0 @@
-
- /* $Id: fpm_php.c,v 1.22.2.4 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "php.h"
-#include "php_main.h"
-#include "php_ini.h"
-#include "ext/standard/dl.h"
-
-#include "fastcgi.h"
-
-#include "fpm.h"
-#include "fpm_php.h"
-#include "fpm_cleanup.h"
-#include "fpm_worker_pool.h"
-
-static int zend_ini_alter_master(char *name, int name_length, char *new_value, int new_value_length, int stage TSRMLS_DC)
-{
- zend_ini_entry *ini_entry;
- char *duplicate;
-
- if (zend_hash_find(EG(ini_directives), name, name_length, (void **) &ini_entry) == FAILURE) {
- return FAILURE;
- }
-
- duplicate = strdup(new_value);
-
- if (!ini_entry->on_modify
- || ini_entry->on_modify(ini_entry, duplicate, new_value_length,
- ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC) == SUCCESS) {
- ini_entry->value = duplicate;
- ini_entry->value_length = new_value_length;
- } else {
- free(duplicate);
- }
-
- return SUCCESS;
-}
-
-static void fpm_php_disable(char *value, int (*zend_disable)(char *, uint TSRMLS_DC) TSRMLS_DC)
-{
- char *s = 0, *e = value;
-
- while (*e) {
- switch (*e) {
- case ' ':
- case ',':
- if (s) {
- *e = '\0';
- zend_disable(s, e - s TSRMLS_CC);
- s = 0;
- }
- break;
- default:
- if (!s) {
- s = e;
- }
- break;
- }
- e++;
- }
-
- if (s) {
- zend_disable(s, e - s TSRMLS_CC);
- }
-}
-
-static int fpm_php_apply_defines(struct fpm_worker_pool_s *wp)
-{
- TSRMLS_FETCH();
- struct key_value_s *kv;
-
- for (kv = wp->config->php_defines; kv; kv = kv->next) {
- char *name = kv->key;
- char *value = kv->value;
- int name_len = strlen(name);
- int value_len = strlen(value);
-
- if (!strcmp(name, "extension") && *value) {
- zval zv;
-
-#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50300)
- php_dl(value, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
-#else
- zval filename;
- ZVAL_STRINGL(&filename, value, value_len, 0);
-#if (PHP_MAJOR_VERSION >= 5)
- php_dl(&filename, MODULE_PERSISTENT, &zv, 1 TSRMLS_CC);
-#else
- php_dl(&filename, MODULE_PERSISTENT, &zv TSRMLS_CC);
-#endif
-#endif
- continue;
- }
-
- zend_ini_alter_master(name, name_len + 1, value, value_len, PHP_INI_STAGE_ACTIVATE TSRMLS_CC);
-
- if (!strcmp(name, "disable_functions") && *value) {
- char *v = strdup(value);
-#if (PHP_MAJOR_VERSION >= 5)
- PG(disable_functions) = v;
-#endif
- fpm_php_disable(v, zend_disable_function TSRMLS_CC);
- }
- else if (!strcmp(name, "disable_classes") && *value) {
- char *v = strdup(value);
-#if (PHP_MAJOR_VERSION >= 5)
- PG(disable_classes) = v;
-#endif
- fpm_php_disable(v, zend_disable_class TSRMLS_CC);
- }
- }
-
- return 0;
-}
-
-static int fpm_php_set_allowed_clients(struct fpm_worker_pool_s *wp)
-{
- if (wp->listen_address_domain == FPM_AF_INET) {
- fcgi_set_allowed_clients(wp->config->allowed_clients);
- }
-
- return 0;
-}
-
-static int fpm_php_set_fcgi_mgmt_vars(struct fpm_worker_pool_s *wp)
-{
- char max_workers[10 + 1]; /* 4294967295 */
- int len;
-
- len = sprintf(max_workers, "%u", (unsigned int) wp->config->pm->max_children);
-
- fcgi_set_mgmt_var("FCGI_MAX_CONNS", sizeof("FCGI_MAX_CONNS")-1, max_workers, len);
- fcgi_set_mgmt_var("FCGI_MAX_REQS", sizeof("FCGI_MAX_REQS")-1, max_workers, len);
-
- return 0;
-}
-
-char *fpm_php_script_filename(TSRMLS_D)
-{
- return SG(request_info).path_translated;
-}
-
-char *fpm_php_request_method(TSRMLS_D)
-{
- return (char *) SG(request_info).request_method;
-}
-
-size_t fpm_php_content_length(TSRMLS_D)
-{
- return SG(request_info).content_length;
-}
-
-static void fpm_php_cleanup(int which, void *arg)
-{
- TSRMLS_FETCH();
- php_module_shutdown(TSRMLS_C);
- sapi_shutdown();
-}
-
-void fpm_php_soft_quit()
-{
- fcgi_set_in_shutdown(1);
-}
-
-int fpm_php_init_main()
-{
- if (0 > fpm_cleanup_add(FPM_CLEANUP_PARENT, fpm_php_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
-
-int fpm_php_init_child(struct fpm_worker_pool_s *wp)
-{
- if (0 > fpm_php_apply_defines(wp) ||
- 0 > fpm_php_set_allowed_clients(wp)) {
- return -1;
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_php.h b/sapi/fpm/fpm/fpm_php.h
deleted file mode 100644
index a05464f..0000000
--- a/sapi/fpm/fpm/fpm_php.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
- /* $Id: fpm_php.h,v 1.10.2.1 2008/11/15 00:57:24 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_PHP_H
-#define FPM_PHP_H 1
-
-#include <TSRM.h>
-
-#include "build-defs.h" /* for PHP_ defines */
-
-struct fpm_worker_pool_s;
-
-int fpm_php_init_child(struct fpm_worker_pool_s *wp);
-char *fpm_php_script_filename(TSRMLS_D);
-char *fpm_php_request_method(TSRMLS_D);
-size_t fpm_php_content_length(TSRMLS_D);
-void fpm_php_soft_quit();
-int fpm_php_init_main();
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c
deleted file mode 100644
index 25a0d71..0000000
--- a/sapi/fpm/fpm/fpm_php_trace.c
+++ /dev/null
@@ -1,171 +0,0 @@
-
- /* $Id: fpm_php_trace.c,v 1.27.2.1 2008/11/15 00:57:24 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#if HAVE_FPM_TRACE
-
-#include "php.h"
-#include "php_main.h"
-
-#include <stdio.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <errno.h>
-
-#include "fpm_trace.h"
-#include "fpm_php_trace.h"
-#include "fpm_children.h"
-#include "fpm_worker_pool.h"
-#include "fpm_process_ctl.h"
-
-#include "zlog.h"
-
-
-#define valid_ptr(p) ((p) && 0 == ((p) & (sizeof(long) - 1)))
-
-#if SIZEOF_LONG == 4
-#define PTR_FMT "08"
-#elif SIZEOF_LONG == 8
-#define PTR_FMT "016"
-#endif
-
-
-static int fpm_php_trace_dump(struct fpm_child_s *child, FILE *slowlog TSRMLS_DC)
-{
- int callers_limit = 20;
- pid_t pid = child->pid;
- struct timeval tv;
- static const int buf_size = 1024;
- char buf[buf_size];
- long execute_data;
- long l;
-
- gettimeofday(&tv, 0);
-
- zlog_print_time(&tv, buf, buf_size);
-
- fprintf(slowlog, "\n%s pid %d (pool %s)\n", buf, (int) pid, child->wp->config->name);
-
- if (0 > fpm_trace_get_strz(buf, buf_size, (long) &SG(request_info).path_translated)) {
- return -1;
- }
-
- fprintf(slowlog, "script_filename = %s\n", buf);
-
- if (0 > fpm_trace_get_long((long) &EG(current_execute_data), &l)) {
- return -1;
- }
-
- execute_data = l;
-
- while (execute_data) {
- long function;
- uint lineno = 0;
-
- fprintf(slowlog, "[0x%" PTR_FMT "lx] ", execute_data);
-
- if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, function_state.function), &l)) {
- return -1;
- }
-
- function = l;
-
- if (valid_ptr(function)) {
- if (0 > fpm_trace_get_strz(buf, buf_size, function + offsetof(zend_function, common.function_name))) {
- return -1;
- }
-
- fprintf(slowlog, "%s()", buf);
- }
- else {
- fprintf(slowlog, "???");
- }
-
- if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, op_array), &l)) {
- return -1;
- }
-
- *buf = '\0';
-
- if (valid_ptr(l)) {
- long op_array = l;
-
- if (0 > fpm_trace_get_strz(buf, buf_size, op_array + offsetof(zend_op_array, filename))) {
- return -1;
- }
- }
-
- if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, opline), &l)) {
- return -1;
- }
-
- if (valid_ptr(l)) {
- long opline = l;
- uint *lu = (uint *) &l;
-
- if (0 > fpm_trace_get_long(opline + offsetof(struct _zend_op, lineno), &l)) {
- return -1;
- }
-
- lineno = *lu;
- }
-
- fprintf(slowlog, " %s:%u\n", *buf ? buf : "unknown", lineno);
-
- if (0 > fpm_trace_get_long(execute_data + offsetof(zend_execute_data, prev_execute_data), &l)) {
- return -1;
- }
-
- execute_data = l;
-
- if (0 == --callers_limit) {
- break;
- }
- }
-
- return 0;
-}
-
-void fpm_php_trace(struct fpm_child_s *child)
-{
- TSRMLS_FETCH();
- FILE *slowlog;
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "about to trace %d", (int) child->pid);
-
- slowlog = fopen(child->wp->config->slowlog, "a+");
-
- if (!slowlog) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fopen(%s) failed", child->wp->config->slowlog);
- goto done0;
- }
-
- if (0 > fpm_trace_ready(child->pid)) {
- goto done1;
- }
-
- if (0 > fpm_php_trace_dump(child, slowlog TSRMLS_CC)) {
- fprintf(slowlog, "+++ dump failed\n");
- }
-
- if (0 > fpm_trace_close(child->pid)) {
- goto done1;
- }
-
-done1:
- fclose(slowlog);
-
-done0:
- fpm_pctl_kill(child->pid, FPM_PCTL_CONT);
- child->tracer = 0;
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "finished trace of %d", (int) child->pid);
-}
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_php_trace.h b/sapi/fpm/fpm/fpm_php_trace.h
deleted file mode 100644
index af5e456..0000000
--- a/sapi/fpm/fpm/fpm_php_trace.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
- /* $Id: fpm_php_trace.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_PHP_TRACE_H
-#define FPM_PHP_TRACE_H 1
-
-struct fpm_child_s;
-
-void fpm_php_trace(struct fpm_child_s *);
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c
deleted file mode 100644
index c9b69eb..0000000
--- a/sapi/fpm/fpm/fpm_process_ctl.c
+++ /dev/null
@@ -1,354 +0,0 @@
-
- /* $Id: fpm_process_ctl.c,v 1.19.2.2 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "fpm.h"
-#include "fpm_clock.h"
-#include "fpm_children.h"
-#include "fpm_signals.h"
-#include "fpm_events.h"
-#include "fpm_process_ctl.h"
-#include "fpm_cleanup.h"
-#include "fpm_request.h"
-#include "fpm_worker_pool.h"
-#include "zlog.h"
-
-
-static int fpm_state = FPM_PCTL_STATE_NORMAL;
-static int fpm_signal_sent = 0;
-
-
-static const char *fpm_state_names[] = {
- [FPM_PCTL_STATE_NORMAL] = "normal",
- [FPM_PCTL_STATE_RELOADING] = "reloading",
- [FPM_PCTL_STATE_TERMINATING] = "terminating",
- [FPM_PCTL_STATE_FINISHING] = "finishing"
-};
-
-static int saved_argc;
-static char **saved_argv;
-
-static void fpm_pctl_cleanup(int which, void *arg)
-{
- int i;
-
- if (which != FPM_CLEANUP_PARENT_EXEC) {
-
- for (i = 0; i < saved_argc; i++) {
- free(saved_argv[i]);
- }
-
- free(saved_argv);
-
- }
-}
-
-static struct event pctl_event;
-
-static void fpm_pctl_action(int fd, short which, void *arg)
-{
- evtimer_del(&pctl_event);
-
- memset(&pctl_event, 0, sizeof(pctl_event));
-
- fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_TIMEOUT);
-}
-
-static int fpm_pctl_timeout_set(int sec)
-{
- struct timeval tv = { .tv_sec = sec, .tv_usec = 0 };
-
- if (evtimer_initialized(&pctl_event)) {
- evtimer_del(&pctl_event);
- }
-
- evtimer_set(&pctl_event, &fpm_pctl_action, 0);
-
- evtimer_add(&pctl_event, &tv);
-
- return 0;
-}
-
-static void fpm_pctl_exit()
-{
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "exiting, bye-bye!");
-
- fpm_conf_unlink_pid();
-
- fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT_MAIN);
-
- exit(0);
-}
-
-#define optional_arg(c) (saved_argc > c ? ", \"" : ""), (saved_argc > c ? saved_argv[c] : ""), (saved_argc > c ? "\"" : "")
-
-static void fpm_pctl_exec()
-{
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "reloading: execvp(\"%s\", {\"%s\""
- "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
- "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s" "%s%s%s"
- "})",
- saved_argv[0], saved_argv[0],
- optional_arg(1),
- optional_arg(2),
- optional_arg(3),
- optional_arg(4),
- optional_arg(5),
- optional_arg(6),
- optional_arg(7),
- optional_arg(8),
- optional_arg(9),
- optional_arg(10)
- );
-
- fpm_cleanups_run(FPM_CLEANUP_PARENT_EXEC);
-
- execvp(saved_argv[0], saved_argv);
-
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "execvp() failed");
-
- exit(1);
-}
-
-static void fpm_pctl_action_last()
-{
- switch (fpm_state) {
-
- case FPM_PCTL_STATE_RELOADING :
-
- fpm_pctl_exec();
- break;
-
- case FPM_PCTL_STATE_FINISHING :
-
- case FPM_PCTL_STATE_TERMINATING :
-
- fpm_pctl_exit();
- break;
- }
-}
-
-int fpm_pctl_kill(pid_t pid, int how)
-{
- int s = 0;
-
- switch (how) {
- case FPM_PCTL_TERM :
- s = SIGTERM;
- break;
- case FPM_PCTL_STOP :
- s = SIGSTOP;
- break;
- case FPM_PCTL_CONT :
- s = SIGCONT;
- break;
- default :
- break;
- }
-
- return kill(pid, s);
-}
-
-static void fpm_pctl_kill_all(int signo)
-{
- struct fpm_worker_pool_s *wp;
- int alive_children = 0;
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
- struct fpm_child_s *child;
-
- for (child = wp->children; child; child = child->next) {
-
- int res = kill(child->pid, signo);
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "sending signal %d %s to child %d (pool %s)", signo,
- fpm_signal_names[signo] ? fpm_signal_names[signo] : "",
- (int) child->pid, child->wp->config->name);
-
- if (res == 0) ++alive_children;
- }
- }
-
- if (alive_children) {
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "%d %s still alive", alive_children, alive_children == 1 ? "child is" : "children are");
- }
-}
-
-static void fpm_pctl_action_next()
-{
- int sig, timeout;
-
- if (!fpm_globals.running_children) fpm_pctl_action_last();
-
- if (fpm_signal_sent == 0) {
- if (fpm_state == FPM_PCTL_STATE_TERMINATING) {
- sig = SIGTERM;
- }
- else {
- sig = SIGQUIT;
- }
- timeout = fpm_global_config.process_control_timeout;
- }
- else {
- if (fpm_signal_sent == SIGQUIT) {
- sig = SIGTERM;
- }
- else {
- sig = SIGKILL;
- }
- timeout = 1;
- }
-
- fpm_pctl_kill_all(sig);
-
- fpm_signal_sent = sig;
-
- fpm_pctl_timeout_set(timeout);
-}
-
-void fpm_pctl(int new_state, int action)
-{
- switch (action) {
-
- case FPM_PCTL_ACTION_SET :
-
- if (fpm_state == new_state) { /* already in progress - just ignore duplicate signal */
- return;
- }
-
- switch (fpm_state) { /* check which states can be overridden */
-
- case FPM_PCTL_STATE_NORMAL :
-
- /* 'normal' can be overridden by any other state */
- break;
-
- case FPM_PCTL_STATE_RELOADING :
-
- /* 'reloading' can be overridden by 'finishing' */
- if (new_state == FPM_PCTL_STATE_FINISHING) break;
-
- case FPM_PCTL_STATE_FINISHING :
-
- /* 'reloading' and 'finishing' can be overridden by 'terminating' */
- if (new_state == FPM_PCTL_STATE_TERMINATING) break;
-
- case FPM_PCTL_STATE_TERMINATING :
-
- /* nothing can override 'terminating' state */
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "not switching to '%s' state, because already in '%s' state",
- fpm_state_names[new_state], fpm_state_names[fpm_state]);
-
- return;
- }
-
- fpm_signal_sent = 0;
- fpm_state = new_state;
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "switching to '%s' state", fpm_state_names[fpm_state]);
-
- /* fall down */
-
- case FPM_PCTL_ACTION_TIMEOUT :
-
- fpm_pctl_action_next();
-
- break;
-
- case FPM_PCTL_ACTION_LAST_CHILD_EXITED :
-
- fpm_pctl_action_last();
-
- break;
-
- }
-}
-
-int fpm_pctl_can_spawn_children()
-{
- return fpm_state == FPM_PCTL_STATE_NORMAL;
-}
-
-int fpm_pctl_child_exited()
-{
- if (fpm_state == FPM_PCTL_STATE_NORMAL) return 0;
-
- if (!fpm_globals.running_children) {
- fpm_pctl(FPM_PCTL_STATE_UNSPECIFIED, FPM_PCTL_ACTION_LAST_CHILD_EXITED);
- }
-
- return 0;
-}
-
-int fpm_pctl_init_main()
-{
- int i;
-
- saved_argc = fpm_globals.argc;
-
- saved_argv = malloc(sizeof(char *) * (saved_argc + 1));
-
- if (!saved_argv) {
- return -1;
- }
-
- for (i = 0; i < saved_argc; i++) {
- saved_argv[i] = strdup(fpm_globals.argv[i]);
-
- if (!saved_argv[i]) {
- return -1;
- }
- }
-
- saved_argv[i] = 0;
-
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_pctl_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
-
-static void fpm_pctl_check_request_timeout(struct timeval *now)
-{
- struct fpm_worker_pool_s *wp;
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
- int terminate_timeout = wp->config->request_terminate_timeout;
- int slowlog_timeout = wp->config->request_slowlog_timeout;
- struct fpm_child_s *child;
-
- if (terminate_timeout || slowlog_timeout) {
- for (child = wp->children; child; child = child->next) {
- fpm_request_check_timed_out(child, now, terminate_timeout, slowlog_timeout);
- }
- }
- }
-
-}
-
-void fpm_pctl_heartbeat(int fd, short which, void *arg)
-{
- static struct event heartbeat;
- struct timeval tv = { .tv_sec = 0, .tv_usec = 130000 };
- struct timeval now;
-
- if (which == EV_TIMEOUT) {
- evtimer_del(&heartbeat);
- fpm_clock_get(&now);
- fpm_pctl_check_request_timeout(&now);
- }
-
- evtimer_set(&heartbeat, &fpm_pctl_heartbeat, 0);
-
- evtimer_add(&heartbeat, &tv);
-}
-
diff --git a/sapi/fpm/fpm/fpm_process_ctl.h b/sapi/fpm/fpm/fpm_process_ctl.h
deleted file mode 100644
index 8424f10..0000000
--- a/sapi/fpm/fpm/fpm_process_ctl.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
- /* $Id: fpm_process_ctl.h,v 1.6 2008/07/20 21:33:10 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_PROCESS_CTL_H
-#define FPM_PROCESS_CTL_H 1
-
-struct fpm_child_s;
-
-void fpm_pctl(int new_state, int action);
-int fpm_pctl_can_spawn_children();
-int fpm_pctl_kill(pid_t pid, int how);
-void fpm_pctl_heartbeat(int fd, short which, void *arg);
-int fpm_pctl_child_exited();
-int fpm_pctl_init_main();
-
-
-enum {
- FPM_PCTL_STATE_UNSPECIFIED,
- FPM_PCTL_STATE_NORMAL,
- FPM_PCTL_STATE_RELOADING,
- FPM_PCTL_STATE_TERMINATING,
- FPM_PCTL_STATE_FINISHING
-};
-
-enum {
- FPM_PCTL_ACTION_SET,
- FPM_PCTL_ACTION_TIMEOUT,
- FPM_PCTL_ACTION_LAST_CHILD_EXITED
-};
-
-enum {
- FPM_PCTL_TERM,
- FPM_PCTL_STOP,
- FPM_PCTL_CONT
-};
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
deleted file mode 100644
index 3faf77d..0000000
--- a/sapi/fpm/fpm/fpm_request.c
+++ /dev/null
@@ -1,164 +0,0 @@
-
- /* $Id: fpm_request.c,v 1.9.2.1 2008/11/15 00:57:24 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include "fpm_php.h"
-#include "fpm_str.h"
-#include "fpm_clock.h"
-#include "fpm_conf.h"
-#include "fpm_trace.h"
-#include "fpm_php_trace.h"
-#include "fpm_process_ctl.h"
-#include "fpm_children.h"
-#include "fpm_shm_slots.h"
-#include "fpm_request.h"
-
-#include "zlog.h"
-
-void fpm_request_accepting()
-{
- struct fpm_shm_slot_s *slot;
-
- slot = fpm_shm_slots_acquire(0, 0);
-
- slot->request_stage = FPM_REQUEST_ACCEPTING;
-
- fpm_clock_get(&slot->tv);
- memset(slot->request_method, 0, sizeof(slot->request_method));
- slot->content_length = 0;
- memset(slot->script_filename, 0, sizeof(slot->script_filename));
-
- fpm_shm_slots_release(slot);
-}
-
-void fpm_request_reading_headers()
-{
- struct fpm_shm_slot_s *slot;
-
- slot = fpm_shm_slots_acquire(0, 0);
-
- slot->request_stage = FPM_REQUEST_READING_HEADERS;
-
- fpm_clock_get(&slot->tv);
- slot->accepted = slot->tv;
-
- fpm_shm_slots_release(slot);
-}
-
-void fpm_request_info()
-{
- TSRMLS_FETCH();
- struct fpm_shm_slot_s *slot;
- char *request_method = fpm_php_request_method(TSRMLS_C);
- char *script_filename = fpm_php_script_filename(TSRMLS_C);
-
- slot = fpm_shm_slots_acquire(0, 0);
-
- slot->request_stage = FPM_REQUEST_INFO;
-
- fpm_clock_get(&slot->tv);
-
- if (request_method) {
- cpystrn(slot->request_method, request_method, sizeof(slot->request_method));
- }
-
- slot->content_length = fpm_php_content_length(TSRMLS_C);
-
- /* if cgi.fix_pathinfo is set to "1" and script cannot be found (404)
- the sapi_globals.request_info.path_translated is set to NULL */
- if (script_filename) {
- cpystrn(slot->script_filename, script_filename, sizeof(slot->script_filename));
- }
-
- fpm_shm_slots_release(slot);
-}
-
-void fpm_request_executing()
-{
- struct fpm_shm_slot_s *slot;
-
- slot = fpm_shm_slots_acquire(0, 0);
-
- slot->request_stage = FPM_REQUEST_EXECUTING;
-
- fpm_clock_get(&slot->tv);
-
- fpm_shm_slots_release(slot);
-}
-
-void fpm_request_finished()
-{
- struct fpm_shm_slot_s *slot;
-
- slot = fpm_shm_slots_acquire(0, 0);
-
- slot->request_stage = FPM_REQUEST_FINISHED;
-
- fpm_clock_get(&slot->tv);
- memset(&slot->accepted, 0, sizeof(slot->accepted));
-
- fpm_shm_slots_release(slot);
-}
-
-void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *now, int terminate_timeout, int slowlog_timeout)
-{
- struct fpm_shm_slot_s *slot;
- struct fpm_shm_slot_s slot_c;
-
- slot = fpm_shm_slot(child);
-
- if (!fpm_shm_slots_acquire(slot, 1)) {
- return;
- }
-
- slot_c = *slot;
-
- fpm_shm_slots_release(slot);
-
-#if HAVE_FPM_TRACE
- if (child->slow_logged.tv_sec) {
- if (child->slow_logged.tv_sec != slot_c.accepted.tv_sec || child->slow_logged.tv_usec != slot_c.accepted.tv_usec) {
- child->slow_logged.tv_sec = 0;
- child->slow_logged.tv_usec = 0;
- }
- }
-#endif
-
- if (slot_c.request_stage > FPM_REQUEST_ACCEPTING && slot_c.request_stage < FPM_REQUEST_FINISHED) {
- char purified_script_filename[sizeof(slot_c.script_filename)];
- struct timeval tv;
-
- timersub(now, &slot_c.accepted, &tv);
-
-#if HAVE_FPM_TRACE
- if (child->slow_logged.tv_sec == 0 && slowlog_timeout &&
- slot_c.request_stage == FPM_REQUEST_EXECUTING && tv.tv_sec >= slowlog_timeout) {
-
- str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
-
- child->slow_logged = slot_c.accepted;
- child->tracer = fpm_php_trace;
-
- fpm_trace_signal(child->pid);
-
- zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) executing too slow (%d.%06d sec), logging",
- (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
- }
-
- else
-#endif
- if (terminate_timeout && tv.tv_sec >= terminate_timeout) {
-
- str_purify_filename(purified_script_filename, slot_c.script_filename, sizeof(slot_c.script_filename));
-
- fpm_pctl_kill(child->pid, FPM_PCTL_TERM);
-
- zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d, script '%s' (pool %s) execution timed out (%d.%06d sec), terminating",
- (int) child->pid, purified_script_filename, child->wp->config->name, (int) tv.tv_sec, (int) tv.tv_usec);
- }
- }
-
-}
-
diff --git a/sapi/fpm/fpm/fpm_request.h b/sapi/fpm/fpm/fpm_request.h
deleted file mode 100644
index d768db6..0000000
--- a/sapi/fpm/fpm/fpm_request.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
- /* $Id: fpm_request.h,v 1.4 2008/07/20 01:47:16 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_REQUEST_H
-#define FPM_REQUEST_H 1
-
-void fpm_request_accepting(); /* hanging in accept() */
-void fpm_request_reading_headers(); /* start reading fastcgi request from very first byte */
-void fpm_request_info(); /* not a stage really but a point in the php code, where all request params have become known to sapi */
-void fpm_request_executing(); /* the script is executing */
-void fpm_request_finished(); /* request processed: script response have been sent to web server */
-
-struct fpm_child_s;
-struct timeval;
-
-void fpm_request_check_timed_out(struct fpm_child_s *child, struct timeval *tv, int terminate_timeout, int slowlog_timeout);
-
-enum fpm_request_stage_e {
- FPM_REQUEST_ACCEPTING = 1,
- FPM_REQUEST_READING_HEADERS,
- FPM_REQUEST_INFO,
- FPM_REQUEST_EXECUTING,
- FPM_REQUEST_FINISHED
-};
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
deleted file mode 100644
index 21c3d75..0000000
--- a/sapi/fpm/fpm/fpm_shm.c
+++ /dev/null
@@ -1,100 +0,0 @@
-
- /* $Id: fpm_shm.c,v 1.3 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <unistd.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-
-#include "fpm_shm.h"
-#include "zlog.h"
-
-
-/* MAP_ANON is depricated, but not in macosx */
-#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-
-
-struct fpm_shm_s *fpm_shm_alloc(size_t sz)
-{
- struct fpm_shm_s *shm;
-
- shm = malloc(sizeof(*shm));
-
- if (!shm) {
- return 0;
- }
-
- shm->mem = mmap(0, sz, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0);
-
- if (!shm->mem) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "mmap(MAP_ANONYMOUS | MAP_SHARED) failed");
- free(shm);
- return 0;
- }
-
- shm->used = 0;
- shm->sz = sz;
-
- return shm;
-}
-
-static void fpm_shm_free(struct fpm_shm_s *shm, int do_unmap)
-{
- if (do_unmap) {
- munmap(shm->mem, shm->sz);
- }
-
- free(shm);
-}
-
-void fpm_shm_free_list(struct fpm_shm_s *shm, void *mem)
-{
- struct fpm_shm_s *next;
-
- for (; shm; shm = next) {
- next = shm->next;
-
- fpm_shm_free(shm, mem != shm->mem);
- }
-}
-
-void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem)
-{
- size_t pagesize = getpagesize();
- static const size_t cache_line_size = 16;
- size_t aligned_sz;
- struct fpm_shm_s *shm;
- void *ret;
-
- sz = (sz + cache_line_size - 1) & -cache_line_size;
-
- shm = *head;
-
- if (0 == shm || shm->sz - shm->used < sz) {
- /* allocate one more shm segment */
-
- aligned_sz = (sz + pagesize - 1) & -pagesize;
-
- shm = fpm_shm_alloc(aligned_sz);
-
- if (!shm) {
- return 0;
- }
-
- shm->next = *head;
- if (shm->next) shm->next->prev = shm;
- shm->prev = 0;
- *head = shm;
- }
-
- *mem = shm->mem;
- ret = (char *) shm->mem + shm->used;
- shm->used += sz;
-
- return ret;
-}
-
diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h
deleted file mode 100644
index f3f0be0..0000000
--- a/sapi/fpm/fpm/fpm_shm.h
+++ /dev/null
@@ -1,22 +0,0 @@
-
- /* $Id: fpm_shm.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_SHM_H
-#define FPM_SHM_H 1
-
-struct fpm_shm_s;
-
-struct fpm_shm_s {
- struct fpm_shm_s *prev, *next;
- void *mem;
- size_t sz;
- size_t used;
-};
-
-struct fpm_shm_s *fpm_shm_alloc(size_t sz);
-void fpm_shm_free_list(struct fpm_shm_s *, void *);
-void *fpm_shm_alloc_chunk(struct fpm_shm_s **head, size_t sz, void **mem);
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_shm_slots.c b/sapi/fpm/fpm/fpm_shm_slots.c
deleted file mode 100644
index efa3707..0000000
--- a/sapi/fpm/fpm/fpm_shm_slots.c
+++ /dev/null
@@ -1,127 +0,0 @@
-
- /* $Id: fpm_shm_slots.c,v 1.2 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include "fpm_atomic.h"
-#include "fpm_worker_pool.h"
-#include "fpm_children.h"
-#include "fpm_shm.h"
-#include "fpm_shm_slots.h"
-#include "zlog.h"
-
-static void *shm_mem;
-static struct fpm_shm_slot_s *shm_slot;
-
-int fpm_shm_slots_prepare_slot(struct fpm_child_s *child)
-{
- struct fpm_worker_pool_s *wp = child->wp;
- struct fpm_shm_slot_ptr_s *shm_slot_ptr;
-
- child->shm_slot_i = wp->slots_used.used;
-
- shm_slot_ptr = fpm_array_push(&wp->slots_used);
-
- if (0 == shm_slot_ptr) {
- return -1;
- }
-
- if (0 == wp->slots_free.used) {
- shm_slot_ptr->shm_slot = fpm_shm_alloc_chunk(&wp->shm_list, sizeof(struct fpm_shm_slot_s), &shm_slot_ptr->mem);
-
- if (!shm_slot_ptr->shm_slot) {
- return -1;
- }
- }
- else {
- *shm_slot_ptr = *(struct fpm_shm_slot_ptr_s *) fpm_array_item_last(&wp->slots_free);
-
- --wp->slots_free.used;
- }
-
- memset(shm_slot_ptr->shm_slot, 0, sizeof(struct fpm_shm_slot_s));
-
- shm_slot_ptr->child = child;
-
- return 0;
-}
-
-void fpm_shm_slots_discard_slot(struct fpm_child_s *child)
-{
- struct fpm_shm_slot_ptr_s *shm_slot_ptr;
- struct fpm_worker_pool_s *wp = child->wp;
- int n;
-
- shm_slot_ptr = fpm_array_push(&wp->slots_free);
-
- if (shm_slot_ptr) {
-
- struct fpm_shm_slot_ptr_s *shm_slot_ptr_used;
-
- shm_slot_ptr_used = fpm_array_item(&wp->slots_used, child->shm_slot_i);
-
- *shm_slot_ptr = *shm_slot_ptr_used;
-
- shm_slot_ptr->child = 0;
-
- }
-
- n = fpm_array_item_remove(&wp->slots_used, child->shm_slot_i);
-
- if (n > -1) {
- shm_slot_ptr = fpm_array_item(&wp->slots_used, n);
-
- shm_slot_ptr->child->shm_slot_i = n;
- }
-}
-
-void fpm_shm_slots_child_use_slot(struct fpm_child_s *child)
-{
- struct fpm_shm_slot_ptr_s *shm_slot_ptr;
- struct fpm_worker_pool_s *wp = child->wp;
-
- shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
-
- shm_slot = shm_slot_ptr->shm_slot;
- shm_mem = shm_slot_ptr->mem;
-}
-
-void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child)
-{
- /* nothing to do */
-}
-
-void *fpm_shm_slots_mem()
-{
- return shm_mem;
-}
-
-struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child)
-{
- struct fpm_shm_slot_ptr_s *shm_slot_ptr;
- struct fpm_worker_pool_s *wp = child->wp;
-
- shm_slot_ptr = fpm_array_item(&wp->slots_used, child->shm_slot_i);
-
- return shm_slot_ptr->shm_slot;
-}
-
-struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *s, int nohang)
-{
- if (s == 0) {
- s = shm_slot;
- }
-
- if (0 > fpm_spinlock(&s->lock, nohang)) {
- return 0;
- }
-
- return s;
-}
-
-void fpm_shm_slots_release(struct fpm_shm_slot_s *s)
-{
- s->lock = 0;
-}
-
diff --git a/sapi/fpm/fpm/fpm_shm_slots.h b/sapi/fpm/fpm/fpm_shm_slots.h
deleted file mode 100644
index 4596c6f..0000000
--- a/sapi/fpm/fpm/fpm_shm_slots.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
- /* $Id: fpm_shm_slots.h,v 1.2 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_SHM_SLOTS_H
-#define FPM_SHM_SLOTS_H 1
-
-#include "fpm_atomic.h"
-#include "fpm_worker_pool.h"
-#include "fpm_request.h"
-
-struct fpm_child_s;
-
-struct fpm_shm_slot_s {
- union {
- atomic_t lock;
- char dummy[16];
- };
- enum fpm_request_stage_e request_stage;
- struct timeval accepted;
- struct timeval tv;
- char request_method[16];
- size_t content_length; /* used with POST only */
- char script_filename[256];
-};
-
-struct fpm_shm_slot_ptr_s {
- void *mem;
- struct fpm_shm_slot_s *shm_slot;
- struct fpm_child_s *child;
-};
-
-int fpm_shm_slots_prepare_slot(struct fpm_child_s *child);
-void fpm_shm_slots_discard_slot(struct fpm_child_s *child);
-void fpm_shm_slots_child_use_slot(struct fpm_child_s *child);
-void fpm_shm_slots_parent_use_slot(struct fpm_child_s *child);
-void *fpm_shm_slots_mem();
-struct fpm_shm_slot_s *fpm_shm_slot(struct fpm_child_s *child);
-struct fpm_shm_slot_s *fpm_shm_slots_acquire(struct fpm_shm_slot_s *, int nohang);
-void fpm_shm_slots_release(struct fpm_shm_slot_s *);
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c
deleted file mode 100644
index 2cf878d..0000000
--- a/sapi/fpm/fpm/fpm_signals.c
+++ /dev/null
@@ -1,252 +0,0 @@
-
- /* $Id: fpm_signals.c,v 1.24 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <signal.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "fpm.h"
-#include "fpm_signals.h"
-#include "fpm_sockets.h"
-#include "fpm_php.h"
-#include "zlog.h"
-
-static int sp[2];
-
-const char *fpm_signal_names[NSIG + 1] = {
-#ifdef SIGHUP
- [SIGHUP] = "SIGHUP",
-#endif
-#ifdef SIGINT
- [SIGINT] = "SIGINT",
-#endif
-#ifdef SIGQUIT
- [SIGQUIT] = "SIGQUIT",
-#endif
-#ifdef SIGILL
- [SIGILL] = "SIGILL",
-#endif
-#ifdef SIGTRAP
- [SIGTRAP] = "SIGTRAP",
-#endif
-#ifdef SIGABRT
- [SIGABRT] = "SIGABRT",
-#endif
-#ifdef SIGEMT
- [SIGEMT] = "SIGEMT",
-#endif
-#ifdef SIGBUS
- [SIGBUS] = "SIGBUS",
-#endif
-#ifdef SIGFPE
- [SIGFPE] = "SIGFPE",
-#endif
-#ifdef SIGKILL
- [SIGKILL] = "SIGKILL",
-#endif
-#ifdef SIGUSR1
- [SIGUSR1] = "SIGUSR1",
-#endif
-#ifdef SIGSEGV
- [SIGSEGV] = "SIGSEGV",
-#endif
-#ifdef SIGUSR2
- [SIGUSR2] = "SIGUSR2",
-#endif
-#ifdef SIGPIPE
- [SIGPIPE] = "SIGPIPE",
-#endif
-#ifdef SIGALRM
- [SIGALRM] = "SIGALRM",
-#endif
-#ifdef SIGTERM
- [SIGTERM] = "SIGTERM",
-#endif
-#ifdef SIGCHLD
- [SIGCHLD] = "SIGCHLD",
-#endif
-#ifdef SIGCONT
- [SIGCONT] = "SIGCONT",
-#endif
-#ifdef SIGSTOP
- [SIGSTOP] = "SIGSTOP",
-#endif
-#ifdef SIGTSTP
- [SIGTSTP] = "SIGTSTP",
-#endif
-#ifdef SIGTTIN
- [SIGTTIN] = "SIGTTIN",
-#endif
-#ifdef SIGTTOU
- [SIGTTOU] = "SIGTTOU",
-#endif
-#ifdef SIGURG
- [SIGURG] = "SIGURG",
-#endif
-#ifdef SIGXCPU
- [SIGXCPU] = "SIGXCPU",
-#endif
-#ifdef SIGXFSZ
- [SIGXFSZ] = "SIGXFSZ",
-#endif
-#ifdef SIGVTALRM
- [SIGVTALRM] = "SIGVTALRM",
-#endif
-#ifdef SIGPROF
- [SIGPROF] = "SIGPROF",
-#endif
-#ifdef SIGWINCH
- [SIGWINCH] = "SIGWINCH",
-#endif
-#ifdef SIGINFO
- [SIGINFO] = "SIGINFO",
-#endif
-#ifdef SIGIO
- [SIGIO] = "SIGIO",
-#endif
-#ifdef SIGPWR
- [SIGPWR] = "SIGPWR",
-#endif
-#ifdef SIGSYS
- [SIGSYS] = "SIGSYS",
-#endif
-#ifdef SIGWAITING
- [SIGWAITING] = "SIGWAITING",
-#endif
-#ifdef SIGLWP
- [SIGLWP] = "SIGLWP",
-#endif
-#ifdef SIGFREEZE
- [SIGFREEZE] = "SIGFREEZE",
-#endif
-#ifdef SIGTHAW
- [SIGTHAW] = "SIGTHAW",
-#endif
-#ifdef SIGCANCEL
- [SIGCANCEL] = "SIGCANCEL",
-#endif
-#ifdef SIGLOST
- [SIGLOST] = "SIGLOST",
-#endif
-};
-
-static void sig_soft_quit(int signo)
-{
- int saved_errno = errno;
-
- /* closing fastcgi listening socket will force fcgi_accept() exit immediately */
- close(0);
- socket(AF_UNIX, SOCK_STREAM, 0);
-
- fpm_php_soft_quit();
-
- errno = saved_errno;
-}
-
-static void sig_handler(int signo)
-{
- static const char sig_chars[NSIG + 1] = {
- [SIGTERM] = 'T',
- [SIGINT] = 'I',
- [SIGUSR1] = '1',
- [SIGUSR2] = '2',
- [SIGQUIT] = 'Q',
- [SIGCHLD] = 'C'
- };
- char s;
- int saved_errno;
-
- if (fpm_globals.parent_pid != getpid()) {
- /* prevent a signal race condition when child process
- have not set up it's own signal handler yet */
- return;
- }
-
- saved_errno = errno;
-
- s = sig_chars[signo];
-
- write(sp[1], &s, sizeof(s));
-
- errno = saved_errno;
-}
-
-int fpm_signals_init_main()
-{
- struct sigaction act;
-
- if (0 > socketpair(AF_UNIX, SOCK_STREAM, 0, sp)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socketpair() failed");
- return -1;
- }
-
- if (0 > fd_set_blocked(sp[0], 0) || 0 > fd_set_blocked(sp[1], 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
- return -1;
- }
-
- if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fcntl(F_SETFD, FD_CLOEXEC) failed");
- return -1;
- }
-
- memset(&act, 0, sizeof(act));
- act.sa_handler = sig_handler;
- sigfillset(&act.sa_mask);
-
- if (0 > sigaction(SIGTERM, &act, 0) ||
- 0 > sigaction(SIGINT, &act, 0) ||
- 0 > sigaction(SIGUSR1, &act, 0) ||
- 0 > sigaction(SIGUSR2, &act, 0) ||
- 0 > sigaction(SIGCHLD, &act, 0) ||
- 0 > sigaction(SIGQUIT, &act, 0)) {
-
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
- return -1;
- }
-
- return 0;
-}
-
-int fpm_signals_init_child()
-{
- struct sigaction act, act_dfl;
-
- memset(&act, 0, sizeof(act));
- memset(&act_dfl, 0, sizeof(act_dfl));
-
- act.sa_handler = &sig_soft_quit;
- act.sa_flags |= SA_RESTART;
-
- act_dfl.sa_handler = SIG_DFL;
-
- close(sp[0]);
- close(sp[1]);
-
- if (0 > sigaction(SIGTERM, &act_dfl, 0) ||
- 0 > sigaction(SIGINT, &act_dfl, 0) ||
- 0 > sigaction(SIGUSR1, &act_dfl, 0) ||
- 0 > sigaction(SIGUSR2, &act_dfl, 0) ||
- 0 > sigaction(SIGCHLD, &act_dfl, 0) ||
- 0 > sigaction(SIGQUIT, &act, 0)) {
-
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "sigaction() failed");
- return -1;
- }
-
- return 0;
-}
-
-int fpm_signals_get_fd()
-{
- return sp[0];
-}
diff --git a/sapi/fpm/fpm/fpm_signals.h b/sapi/fpm/fpm/fpm_signals.h
deleted file mode 100644
index eb80fae..0000000
--- a/sapi/fpm/fpm/fpm_signals.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
- /* $Id: fpm_signals.h,v 1.5 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_SIGNALS_H
-#define FPM_SIGNALS_H 1
-
-#include <signal.h>
-
-int fpm_signals_init_main();
-int fpm_signals_init_child();
-int fpm_signals_get_fd();
-
-extern const char *fpm_signal_names[NSIG + 1];
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
deleted file mode 100644
index 5acb559..0000000
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ /dev/null
@@ -1,427 +0,0 @@
-
- /* $Id: fpm_sockets.c,v 1.20.2.1 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h> /* for chmod(2) */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "zlog.h"
-#include "fpm_arrays.h"
-#include "fpm_sockets.h"
-#include "fpm_worker_pool.h"
-#include "fpm_unix.h"
-#include "fpm_str.h"
-#include "fpm_env.h"
-#include "fpm_cleanup.h"
-
-struct listening_socket_s {
- int refcount;
- int sock;
- int type;
- char *key;
-};
-
-static struct fpm_array_s sockets_list;
-
-static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr)
-{
- struct addrinfo *res;
- struct addrinfo hints;
- int ret;
-
- memset(&hints, 0, sizeof(hints));
-
- hints.ai_family = AF_INET;
-
- ret = getaddrinfo(node, service, &hints, &res);
-
- if (ret != 0) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
- node, service ? ":" : "", service ? service : "",
- gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
- return -1;
- }
-
- *addr = *(struct sockaddr_in *) res->ai_addr;
-
- freeaddrinfo(res);
-
- return 0;
-}
-
-enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
-
-static void fpm_sockets_cleanup(int which, void *arg)
-{
- int i;
- char *env_value = 0;
- int p = 0;
- struct listening_socket_s *ls = sockets_list.data;
-
- for (i = 0; i < sockets_list.used; i++, ls++) {
-
- if (which != FPM_CLEANUP_PARENT_EXEC) {
-
- close(ls->sock);
-
- }
- else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
- char fd[32];
- sprintf(fd, "%d", ls->sock);
- env_value = realloc(env_value, p + (p ? 1 : 0) + strlen(ls->key) + 1 + strlen(fd) + 1);
- p += sprintf(env_value + p, "%s%s=%s", p ? "," : "", ls->key, fd);
- }
-
- if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
-
- if (ls->type == FPM_AF_UNIX) {
- unlink(ls->key);
- }
-
- }
-
- free(ls->key);
- }
-
- if (env_value) {
- setenv("FPM_SOCKETS", env_value, 1);
- free(env_value);
- }
-
- fpm_array_free(&sockets_list);
-}
-
-static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op)
-{
-
- if (key == NULL) {
-
- switch (type) {
-
- case FPM_AF_INET : {
- struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
-
- key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
-
- sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
-
- break;
- }
-
- case FPM_AF_UNIX : {
- struct sockaddr_un *sa_un = (struct sockaddr_un *) sa;
-
- key = alloca(strlen(sa_un->sun_path) + 1);
-
- strcpy(key, sa_un->sun_path);
-
- break;
- }
-
- default :
-
- return -1;
- }
-
- }
-
- switch (op) {
-
- case FPM_GET_USE_SOCKET :
- {
-
- int i;
- struct listening_socket_s *ls = sockets_list.data;
-
- for (i = 0; i < sockets_list.used; i++, ls++) {
-
- if (!strcmp(ls->key, key)) {
- ++ls->refcount;
- return ls->sock;
- }
- }
-
- break;
- }
-
- case FPM_STORE_SOCKET : /* inherited socket */
- case FPM_STORE_USE_SOCKET : /* just created */
- {
-
- struct listening_socket_s *ls;
-
- ls = fpm_array_push(&sockets_list);
-
- if (!ls) {
- break;
- }
-
- if (op == FPM_STORE_SOCKET) {
- ls->refcount = 0;
- }
- else {
- ls->refcount = 1;
- }
- ls->type = type;
- ls->sock = sock;
- ls->key = strdup(key);
-
- return 0;
-
- }
- }
-
- return -1;
-
-}
-
-static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
-{
- int backlog = -1;
- int flags = 1;
- int sock;
- mode_t saved_umask;
-
- /* we have custom backlog value */
- if (wp->config->listen_options) {
- backlog = wp->config->listen_options->backlog;
- }
-
- sock = socket(sa->sa_family, SOCK_STREAM, 0);
-
- if (0 > sock) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "socket() failed");
- return -1;
- }
-
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
-
- if (wp->listen_address_domain == FPM_AF_UNIX) {
- unlink( ((struct sockaddr_un *) sa)->sun_path);
- }
-
- saved_umask = umask(0777 ^ wp->socket_mode);
-
- if (0 > bind(sock, sa, socklen)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "bind() for address '%s' failed", wp->config->listen_address);
- return -1;
- }
-
- if (wp->listen_address_domain == FPM_AF_UNIX) {
-
- char *path = ((struct sockaddr_un *) sa)->sun_path;
-
- if (wp->socket_uid != -1 || wp->socket_gid != -1) {
-
- if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chown() for address '%s' failed", wp->config->listen_address);
- return -1;
- }
-
- }
-
- }
-
- umask(saved_umask);
-
- if (0 > listen(sock, backlog)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "listen() for address '%s' failed", wp->config->listen_address);
- return -1;
- }
-
- return sock;
-}
-
-static int fpm_sockets_get_listening_socket(struct fpm_worker_pool_s *wp, struct sockaddr *sa, int socklen)
-{
- int sock;
-
- sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET);
-
- if (sock >= 0) return sock;
-
- sock = fpm_sockets_new_listening_socket(wp, sa, socklen);
-
- fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET);
-
- return sock;
-}
-
-enum fpm_address_domain fpm_sockets_domain_from_address(char *address)
-{
- if (strchr(address, ':')) return FPM_AF_INET;
-
- if (strlen(address) == strspn(address, "0123456789")) return FPM_AF_INET;
-
- return FPM_AF_UNIX;
-}
-
-static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp)
-{
- struct sockaddr_in sa_in;
- char *dup_address = strdup(wp->config->listen_address);
- char *port_str = strchr(dup_address, ':');
- char *addr = NULL;
- int port = 0;
-
- if (port_str) { /* this is host:port pair */
- *port_str++ = '\0';
- port = atoi(port_str);
- addr = dup_address;
- }
- else if (strlen(dup_address) == strspn(dup_address, "0123456789")) { /* this is port */
- port = atoi(dup_address);
- port_str = dup_address;
- }
-
- if (port == 0) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "invalid port value '%s'", port_str);
- return -1;
- }
-
- memset(&sa_in, 0, sizeof(sa_in));
-
- if (addr) {
-
- sa_in.sin_addr.s_addr = inet_addr(addr);
-
- if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
- if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
- return -1;
- }
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
- }
- }
- else {
-
- sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
-
- }
-
- sa_in.sin_family = AF_INET;
- sa_in.sin_port = htons(port);
-
- free(dup_address);
-
- return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
-}
-
-static int fpm_socket_af_unix_listening_socket(struct fpm_worker_pool_s *wp)
-{
- struct sockaddr_un sa_un;
-
- memset(&sa_un, 0, sizeof(sa_un));
-
- cpystrn(sa_un.sun_path, wp->config->listen_address, sizeof(sa_un.sun_path));
- sa_un.sun_family = AF_UNIX;
-
- return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_un, sizeof(struct sockaddr_un));
-}
-
-int fpm_sockets_init_main()
-{
- int i;
- struct fpm_worker_pool_s *wp;
- char *inherited = getenv("FPM_SOCKETS");
- struct listening_socket_s *ls;
-
- if (0 == fpm_array_init(&sockets_list, sizeof(struct listening_socket_s), 10)) {
- return -1;
- }
-
- /* import inherited sockets */
- while (inherited && *inherited) {
- char *comma = strchr(inherited, ',');
- int type, fd_no;
- char *eq;
-
- if (comma) *comma = '\0';
-
- eq = strchr(inherited, '=');
-
- if (eq) {
- *eq = '\0';
-
- fd_no = atoi(eq + 1);
-
- type = fpm_sockets_domain_from_address(inherited);
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "using inherited socket fd=%d, \"%s\"", fd_no, inherited);
-
- fpm_sockets_hash_op(fd_no, 0, inherited, type, FPM_STORE_SOCKET);
- }
-
- if (comma) inherited = comma + 1;
- else inherited = 0;
- }
-
- /* create all required sockets */
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-
- if (!wp->is_template) {
-
- switch (wp->listen_address_domain) {
-
- case FPM_AF_INET :
-
- wp->listening_socket = fpm_socket_af_inet_listening_socket(wp);
- break;
-
- case FPM_AF_UNIX :
-
- if (0 > fpm_unix_resolve_socket_premissions(wp)) {
- return -1;
- }
-
- wp->listening_socket = fpm_socket_af_unix_listening_socket(wp);
- break;
-
- }
-
- if (wp->listening_socket == -1) {
- return -1;
- }
- }
-
- }
-
- /* close unused sockets that was inherited */
- ls = sockets_list.data;
-
- for (i = 0; i < sockets_list.used; ) {
-
- if (ls->refcount == 0) {
- close(ls->sock);
- if (ls->type == FPM_AF_UNIX) {
- unlink(ls->key);
- }
- free(ls->key);
- fpm_array_item_remove(&sockets_list, i);
- }
- else {
- ++i;
- ++ls;
- }
- }
-
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_sockets_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h
deleted file mode 100644
index d5433e3..0000000
--- a/sapi/fpm/fpm/fpm_sockets.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
- /* $Id: fpm_sockets.h,v 1.12 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_MISC_H
-#define FPM_MISC_H 1
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "fpm_worker_pool.h"
-
-enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
-int fpm_sockets_init_main();
-
-
-static inline int fd_set_blocked(int fd, int blocked)
-{
- int flags = fcntl(fd, F_GETFL);
-
- if (flags < 0) return -1;
-
- if (blocked)
- flags &= ~O_NONBLOCK;
- else
- flags |= O_NONBLOCK;
-
- return fcntl(fd, F_SETFL, flags);
-}
-
-#define IPQUAD(sin_addr) \
- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \
- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[1], \
- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[2], \
- (unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
deleted file mode 100644
index a6818d7..0000000
--- a/sapi/fpm/fpm/fpm_stdio.c
+++ /dev/null
@@ -1,286 +0,0 @@
-
- /* $Id: fpm_stdio.c,v 1.22.2.2 2008/12/13 03:32:24 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-
-#include "fpm.h"
-#include "fpm_children.h"
-#include "fpm_events.h"
-#include "fpm_sockets.h"
-#include "fpm_stdio.h"
-#include "zlog.h"
-
-static int fd_stdout[2];
-static int fd_stderr[2];
-
-int fpm_stdio_init_main()
-{
- int fd = open("/dev/null", O_RDWR);
-
- if (0 > fd) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"/dev/null\") failed");
- return -1;
- }
-
- if (0 > dup2(fd, STDIN_FILENO) || 0 > dup2(fd, STDOUT_FILENO)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
- return -1;
- }
-
- close(fd);
-
- return 0;
-}
-
-int fpm_stdio_init_final()
-{
- if (fpm_global_config.daemonize) {
-
- if (fpm_globals.error_log_fd != STDERR_FILENO) {
- /* there might be messages to stderr from libevent, we need to log them all */
- if (0 > dup2(fpm_globals.error_log_fd, STDERR_FILENO)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
- return -1;
- }
- }
-
- zlog_set_level(fpm_globals.log_level);
-
- zlog_set_fd(fpm_globals.error_log_fd);
- }
-
- return 0;
-}
-
-int fpm_stdio_init_child(struct fpm_worker_pool_s *wp)
-{
- close(fpm_globals.error_log_fd);
- fpm_globals.error_log_fd = -1;
- zlog_set_fd(-1);
-
- if (wp->listening_socket != STDIN_FILENO) {
- if (0 > dup2(wp->listening_socket, STDIN_FILENO)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "dup2() failed");
- return -1;
- }
- }
-
- return 0;
-}
-
-static void fpm_stdio_child_said(int fd, short which, void *arg)
-{
- static const int max_buf_size = 1024;
- char buf[max_buf_size];
- struct fpm_child_s *child = arg;
- int is_stdout = fd == child->fd_stdout;
- struct event *ev = is_stdout ? &child->ev_stdout : &child->ev_stderr;
- int fifo_in = 1, fifo_out = 1;
- int is_last_message = 0;
- int in_buf = 0;
- int res;
-
-#if 0
- zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d said %s", (int) child->pid, is_stdout ? "stdout" : "stderr");
-#endif
-
- while (fifo_in || fifo_out) {
-
- if (fifo_in) {
-
- res = read(fd, buf + in_buf, max_buf_size - 1 - in_buf);
-
- if (res <= 0) { /* no data */
- fifo_in = 0;
-
- if (res < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
- /* just no more data ready */
- }
- else { /* error or pipe is closed */
-
- if (res < 0) { /* error */
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "read() failed");
- }
-
- fpm_event_del(ev);
- is_last_message = 1;
-
- if (is_stdout) {
- close(child->fd_stdout);
- child->fd_stdout = -1;
- }
- else {
- close(child->fd_stderr);
- child->fd_stderr = -1;
- }
-
-#if 0
- if (in_buf == 0 && !fpm_globals.is_child) {
- zlog(ZLOG_STUFF, ZLOG_DEBUG, "child %d (pool %s) %s pipe is closed", (int) child->pid,
- child->wp->config->name, is_stdout ? "stdout" : "stderr");
- }
-#endif
- }
- }
- else {
- in_buf += res;
- }
- }
-
- if (fifo_out) {
- if (in_buf == 0) {
- fifo_out = 0;
- }
- else {
- char *nl;
- int should_print = 0;
- buf[in_buf] = '\0';
-
- /* FIXME: there might be binary data */
-
- /* we should print if no more space in the buffer */
- if (in_buf == max_buf_size - 1) {
- should_print = 1;
- }
-
- /* we should print if no more data to come */
- if (!fifo_in) {
- should_print = 1;
- }
-
- nl = strchr(buf, '\n');
-
- if (nl || should_print) {
-
- if (nl) {
- *nl = '\0';
- }
-
- zlog(ZLOG_STUFF, ZLOG_WARNING, "child %d (pool %s) said into %s: \"%s\"%s", (int) child->pid,
- child->wp->config->name, is_stdout ? "stdout" : "stderr", buf, is_last_message ? ", pipe is closed" : "");
-
- if (nl) {
- int out_buf = 1 + nl - buf;
- memmove(buf, buf + out_buf, in_buf - out_buf);
- in_buf -= out_buf;
- }
- else {
- in_buf = 0;
- }
- }
- }
- }
- }
-
-}
-
-int fpm_stdio_prepare_pipes(struct fpm_child_s *child)
-{
- if (0 == child->wp->config->catch_workers_output) { /* not required */
- return 0;
- }
-
- if (0 > pipe(fd_stdout)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
- return -1;
- }
-
- if (0 > pipe(fd_stderr)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pipe() failed");
- close(fd_stdout[0]); close(fd_stdout[1]);
- return -1;
- }
-
- if (0 > fd_set_blocked(fd_stdout[0], 0) || 0 > fd_set_blocked(fd_stderr[0], 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fd_set_blocked() failed");
- close(fd_stdout[0]); close(fd_stdout[1]);
- close(fd_stderr[0]); close(fd_stderr[1]);
- return -1;
- }
-
- return 0;
-}
-
-int fpm_stdio_parent_use_pipes(struct fpm_child_s *child)
-{
- if (0 == child->wp->config->catch_workers_output) { /* not required */
- return 0;
- }
-
- close(fd_stdout[1]);
- close(fd_stderr[1]);
-
- child->fd_stdout = fd_stdout[0];
- child->fd_stderr = fd_stderr[0];
-
- fpm_event_add(child->fd_stdout, &child->ev_stdout, fpm_stdio_child_said, child);
- fpm_event_add(child->fd_stderr, &child->ev_stderr, fpm_stdio_child_said, child);
-
- return 0;
-}
-
-int fpm_stdio_discard_pipes(struct fpm_child_s *child)
-{
- if (0 == child->wp->config->catch_workers_output) { /* not required */
- return 0;
- }
-
- close(fd_stdout[1]);
- close(fd_stderr[1]);
-
- close(fd_stdout[0]);
- close(fd_stderr[0]);
-
- return 0;
-}
-
-void fpm_stdio_child_use_pipes(struct fpm_child_s *child)
-{
- if (child->wp->config->catch_workers_output) {
- dup2(fd_stdout[1], STDOUT_FILENO);
- dup2(fd_stderr[1], STDERR_FILENO);
- close(fd_stdout[0]); close(fd_stdout[1]);
- close(fd_stderr[0]); close(fd_stderr[1]);
- }
- else {
- /* stdout of parent is always /dev/null */
- dup2(STDOUT_FILENO, STDERR_FILENO);
- }
-}
-
-int fpm_stdio_open_error_log(int reopen)
-{
- int fd;
-
- fd = open(fpm_global_config.error_log, O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR);
-
- if (0 > fd) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(\"%s\") failed", fpm_global_config.error_log);
- return -1;
- }
-
- if (reopen) {
- if (fpm_global_config.daemonize) {
- dup2(fd, STDERR_FILENO);
- }
-
- dup2(fd, fpm_globals.error_log_fd);
- close(fd);
- fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
- }
- else {
- fpm_globals.error_log_fd = fd;
- }
-
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_stdio.h b/sapi/fpm/fpm/fpm_stdio.h
deleted file mode 100644
index d3d61e4..0000000
--- a/sapi/fpm/fpm/fpm_stdio.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
- /* $Id: fpm_stdio.h,v 1.9 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_STDIO_H
-#define FPM_STDIO_H 1
-
-#include "fpm_worker_pool.h"
-
-int fpm_stdio_init_main();
-int fpm_stdio_init_final();
-int fpm_stdio_init_child(struct fpm_worker_pool_s *wp);
-int fpm_stdio_prepare_pipes(struct fpm_child_s *child);
-void fpm_stdio_child_use_pipes(struct fpm_child_s *child);
-int fpm_stdio_parent_use_pipes(struct fpm_child_s *child);
-int fpm_stdio_discard_pipes(struct fpm_child_s *child);
-int fpm_stdio_open_error_log(int reopen);
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_str.h b/sapi/fpm/fpm/fpm_str.h
deleted file mode 100644
index 19e2055..0000000
--- a/sapi/fpm/fpm/fpm_str.h
+++ /dev/null
@@ -1,49 +0,0 @@
-
- /* $Id: fpm_str.h,v 1.3 2008/05/24 17:38:47 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_STR_H
-#define FPM_STR_H 1
-
-static inline char *cpystrn(char *dst, const char *src, size_t dst_size)
-{
- char *d, *end;
-
- if (!dst_size) return dst;
-
- d = dst;
- end = dst + dst_size - 1;
-
- for (; d < end; ++d, ++src) {
- if (!(*d = *src)) {
- return d;
- }
- }
-
- *d = '\0';
-
- return d;
-}
-
-static inline char *str_purify_filename(char *dst, char *src, size_t size)
-{
- char *d, *end;
-
- d = dst;
- end = dst + size - 1;
-
- for (; d < end && *src; ++d, ++src) {
- if (* (unsigned char *) src < ' ' || * (unsigned char *) src > '\x7f') {
- *d = '.';
- }
- else {
- *d = *src;
- }
- }
-
- *d = '\0';
-
- return d;
-}
-
-#endif
diff --git a/sapi/fpm/fpm/fpm_trace.c b/sapi/fpm/fpm/fpm_trace.c
deleted file mode 100644
index 7996355..0000000
--- a/sapi/fpm/fpm/fpm_trace.c
+++ /dev/null
@@ -1,46 +0,0 @@
-
- /* $Id: fpm_trace.c,v 1.1 2008/07/20 20:59:00 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/types.h>
-
-#include "fpm_trace.h"
-
-int fpm_trace_get_strz(char *buf, size_t sz, long addr)
-{
- int i;
- long l;
- char *lc = (char *) &l;
-
- if (0 > fpm_trace_get_long(addr, &l)) {
- return -1;
- }
-
- i = l % SIZEOF_LONG;
-
- l -= i;
-
- for (addr = l; ; addr += SIZEOF_LONG) {
-
- if (0 > fpm_trace_get_long(addr, &l)) {
- return -1;
- }
-
- for ( ; i < SIZEOF_LONG; i++) {
- --sz;
-
- if (sz && lc[i]) {
- *buf++ = lc[i];
- continue;
- }
-
- *buf = '\0';
- return 0;
- }
-
- i = 0;
- }
-}
-
diff --git a/sapi/fpm/fpm/fpm_trace.h b/sapi/fpm/fpm/fpm_trace.h
deleted file mode 100644
index b421172..0000000
--- a/sapi/fpm/fpm/fpm_trace.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
- /* $Id: fpm_trace.h,v 1.3 2008/07/20 22:43:39 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_TRACE_H
-#define FPM_TRACE_H 1
-
-#include <unistd.h>
-
-int fpm_trace_signal(pid_t pid);
-int fpm_trace_ready(pid_t pid);
-int fpm_trace_close(pid_t pid);
-int fpm_trace_get_long(long addr, long *data);
-int fpm_trace_get_strz(char *buf, size_t sz, long addr);
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_trace_mach.c b/sapi/fpm/fpm/fpm_trace_mach.c
deleted file mode 100644
index 11cb9cf..0000000
--- a/sapi/fpm/fpm/fpm_trace_mach.c
+++ /dev/null
@@ -1,102 +0,0 @@
-
- /* $Id: fpm_trace_mach.c,v 1.4 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <mach/mach.h>
-#include <mach/mach_vm.h>
-
-#include <unistd.h>
-
-#include "fpm_trace.h"
-#include "fpm_process_ctl.h"
-#include "fpm_unix.h"
-#include "zlog.h"
-
-
-static mach_port_name_t target;
-static vm_offset_t target_page_base;
-static vm_offset_t local_page;
-static mach_msg_type_number_t local_size;
-
-static void fpm_mach_vm_deallocate()
-{
- if (local_page) {
- mach_vm_deallocate(mach_task_self(), local_page, local_size);
- target_page_base = 0;
- local_page = 0;
- local_size = 0;
- }
-}
-
-static int fpm_mach_vm_read_page(vm_offset_t page)
-{
- kern_return_t kr;
-
- kr = mach_vm_read(target, page, fpm_pagesize, &local_page, &local_size);
-
- if (kr != KERN_SUCCESS) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "mach_vm_read() failed: %s (%d)", mach_error_string(kr), kr);
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_signal(pid_t pid)
-{
- if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_ready(pid_t pid)
-{
- kern_return_t kr;
-
- kr = task_for_pid(mach_task_self(), pid, &target);
-
- if (kr != KERN_SUCCESS) {
- char *msg = "";
-
- if (kr == KERN_FAILURE) {
- msg = " It seems that master process does not have enough privileges to trace processes.";
- }
-
- zlog(ZLOG_STUFF, ZLOG_ERROR, "task_for_pid() failed: %s (%d)%s", mach_error_string(kr), kr, msg);
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_close(pid_t pid)
-{
- fpm_mach_vm_deallocate();
-
- target = 0;
-
- return 0;
-}
-
-int fpm_trace_get_long(long addr, long *data)
-{
- size_t offset = ((uintptr_t) (addr) % fpm_pagesize);
- vm_offset_t base = (uintptr_t) (addr) - offset;
-
- if (base != target_page_base) {
- fpm_mach_vm_deallocate();
- if (0 > fpm_mach_vm_read_page(base)) {
- return -1;
- }
- }
-
- *data = * (long *) (local_page + offset);
-
- return 0;
-}
-
diff --git a/sapi/fpm/fpm/fpm_trace_pread.c b/sapi/fpm/fpm/fpm_trace_pread.c
deleted file mode 100644
index f41bb91..0000000
--- a/sapi/fpm/fpm/fpm_trace_pread.c
+++ /dev/null
@@ -1,67 +0,0 @@
-
- /* $Id: fpm_trace_pread.c,v 1.7 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#define _GNU_SOURCE
-#define _FILE_OFFSET_BITS 64
-
-#include "fpm_config.h"
-
-#include <unistd.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#include "fpm_trace.h"
-#include "fpm_process_ctl.h"
-#include "zlog.h"
-
-
-static int mem_file = -1;
-
-int fpm_trace_signal(pid_t pid)
-{
- if (0 > fpm_pctl_kill(pid, FPM_PCTL_STOP)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "kill(SIGSTOP) failed");
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_ready(pid_t pid)
-{
- char buf[128];
-
- sprintf(buf, "/proc/%d/" PROC_MEM_FILE, (int) pid);
-
- mem_file = open(buf, O_RDONLY);
-
- if (0 > mem_file) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "open(%s) failed", buf);
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_close(pid_t pid)
-{
- close(mem_file);
-
- mem_file = -1;
-
- return 0;
-}
-
-int fpm_trace_get_long(long addr, long *data)
-{
- if (sizeof(*data) != pread(mem_file, (void *) data, sizeof(*data), (uintptr_t) addr)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "pread() failed");
- return -1;
- }
-
- return 0;
-}
-
diff --git a/sapi/fpm/fpm/fpm_trace_ptrace.c b/sapi/fpm/fpm/fpm_trace_ptrace.c
deleted file mode 100644
index 11e2081..0000000
--- a/sapi/fpm/fpm/fpm_trace_ptrace.c
+++ /dev/null
@@ -1,85 +0,0 @@
-
- /* $Id: fpm_trace_ptrace.c,v 1.7 2008/09/18 23:34:11 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <sys/wait.h>
-#include <sys/ptrace.h>
-#include <unistd.h>
-#include <errno.h>
-
-#if defined(PT_ATTACH) && !defined(PTRACE_ATTACH)
-#define PTRACE_ATTACH PT_ATTACH
-#endif
-
-#if defined(PT_DETACH) && !defined(PTRACE_DETACH)
-#define PTRACE_DETACH PT_DETACH
-#endif
-
-#if defined(PT_READ_D) && !defined(PTRACE_PEEKDATA)
-#define PTRACE_PEEKDATA PT_READ_D
-#endif
-
-#include "fpm_trace.h"
-#include "zlog.h"
-
-static pid_t traced_pid;
-
-int fpm_trace_signal(pid_t pid)
-{
- if (0 > ptrace(PTRACE_ATTACH, pid, 0, 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(ATTACH) failed");
- return -1;
- }
-
- return 0;
-}
-
-int fpm_trace_ready(pid_t pid)
-{
- traced_pid = pid;
-
- return 0;
-}
-
-int fpm_trace_close(pid_t pid)
-{
- if (0 > ptrace(PTRACE_DETACH, pid, (void *) 1, 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(DETACH) failed");
- return -1;
- }
-
- traced_pid = 0;
-
- return 0;
-}
-
-int fpm_trace_get_long(long addr, long *data)
-{
-#ifdef PT_IO
- struct ptrace_io_desc ptio = {
- .piod_op = PIOD_READ_D,
- .piod_offs = (void *) addr,
- .piod_addr = (void *) data,
- .piod_len = sizeof(long)
- };
-
- if (0 > ptrace(PT_IO, traced_pid, (void *) &ptio, 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PT_IO) failed");
- return -1;
- }
-#else
- errno = 0;
-
- *data = ptrace(PTRACE_PEEKDATA, traced_pid, (void *) addr, 0);
-
- if (errno) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "ptrace(PEEKDATA) failed");
- return -1;
- }
-#endif
-
- return 0;
-}
-
diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
deleted file mode 100644
index 4d5eecc..0000000
--- a/sapi/fpm/fpm/fpm_unix.c
+++ /dev/null
@@ -1,289 +0,0 @@
-
- /* $Id: fpm_unix.c,v 1.25.2.1 2008/12/13 03:18:23 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <string.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-
-#ifdef HAVE_PRCTL
-#include <sys/prctl.h>
-#endif
-
-#include "fpm.h"
-#include "fpm_conf.h"
-#include "fpm_cleanup.h"
-#include "fpm_clock.h"
-#include "fpm_stdio.h"
-#include "fpm_unix.h"
-#include "zlog.h"
-
-size_t fpm_pagesize;
-
-int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp)
-{
- struct fpm_listen_options_s *lo = wp->config->listen_options;
-
- /* uninitialized */
- wp->socket_uid = -1;
- wp->socket_gid = -1;
- wp->socket_mode = 0666;
-
- if (!lo) return 0;
-
- if (lo->owner && *lo->owner) {
- struct passwd *pwd;
-
- pwd = getpwnam(lo->owner);
-
- if (!pwd) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get uid for user '%s', pool '%s'", lo->owner, wp->config->name);
- return -1;
- }
-
- wp->socket_uid = pwd->pw_uid;
- wp->socket_gid = pwd->pw_gid;
- }
-
- if (lo->group && *lo->group) {
- struct group *grp;
-
- grp = getgrnam(lo->group);
-
- if (!grp) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "cannot get gid for group '%s', pool '%s'", lo->group, wp->config->name);
- return -1;
- }
-
- wp->socket_gid = grp->gr_gid;
- }
-
- if (lo->mode && *lo->mode) {
- wp->socket_mode = strtoul(lo->mode, 0, 8);
- }
-
- return 0;
-}
-
-static int fpm_unix_conf_wp(struct fpm_worker_pool_s *wp)
-{
- int is_root = !geteuid();
-
- if (is_root) {
- if (wp->config->user && *wp->config->user) {
-
- if (strlen(wp->config->user) == strspn(wp->config->user, "0123456789")) {
- wp->set_uid = strtoul(wp->config->user, 0, 10);
- }
- else {
- struct passwd *pwd;
-
- pwd = getpwnam(wp->config->user);
-
- if (!pwd) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get uid for user '%s', pool '%s'", wp->config->user, wp->config->name);
- return -1;
- }
-
- wp->set_uid = pwd->pw_uid;
- wp->set_gid = pwd->pw_gid;
-
- wp->user = strdup(pwd->pw_name);
- wp->home = strdup(pwd->pw_dir);
- }
- }
-
- if (wp->config->group && *wp->config->group) {
-
- if (strlen(wp->config->group) == strspn(wp->config->group, "0123456789")) {
- wp->set_gid = strtoul(wp->config->group, 0, 10);
- }
- else {
- struct group *grp;
-
- grp = getgrnam(wp->config->group);
-
- if (!grp) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "cannot get gid for group '%s', pool '%s'", wp->config->group, wp->config->name);
- return -1;
- }
-
- wp->set_gid = grp->gr_gid;
- }
- }
-
-#ifndef I_REALLY_WANT_ROOT_PHP
- if (wp->set_uid == 0 || wp->set_gid == 0) {
- zlog(ZLOG_STUFF, ZLOG_ERROR, "please specify user and group other than root, pool '%s'", wp->config->name);
- return -1;
- }
-#endif
- }
- else { /* not root */
- if (wp->config->user && *wp->config->user) {
- zlog(ZLOG_STUFF, ZLOG_WARNING, "'user' directive is ignored, pool '%s'", wp->config->name);
- }
- if (wp->config->group && *wp->config->group) {
- zlog(ZLOG_STUFF, ZLOG_WARNING, "'group' directive is ignored, pool '%s'", wp->config->name);
- }
- if (wp->config->chroot && *wp->config->chroot) {
- zlog(ZLOG_STUFF, ZLOG_WARNING, "'chroot' directive is ignored, pool '%s'", wp->config->name);
- }
-
- { /* set up HOME and USER anyway */
- struct passwd *pwd;
-
- pwd = getpwuid(getuid());
-
- if (pwd) {
- wp->user = strdup(pwd->pw_name);
- wp->home = strdup(pwd->pw_dir);
- }
- }
- }
-
- return 0;
-}
-
-int fpm_unix_init_child(struct fpm_worker_pool_s *wp)
-{
- int is_root = !geteuid();
- int made_chroot = 0;
-
- if (wp->config->rlimit_files) {
- struct rlimit r;
-
- getrlimit(RLIMIT_NOFILE, &r);
-
- r.rlim_cur = (rlim_t) wp->config->rlimit_files;
-
- if (0 > setrlimit(RLIMIT_NOFILE, &r)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setrlimit(RLIMIT_NOFILE) failed");
- }
- }
-
- if (wp->config->rlimit_core) {
- struct rlimit r;
-
- getrlimit(RLIMIT_CORE, &r);
-
- r.rlim_cur = wp->config->rlimit_core == -1 ? (rlim_t) RLIM_INFINITY : (rlim_t) wp->config->rlimit_core;
-
- if (0 > setrlimit(RLIMIT_CORE, &r)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setrlimit(RLIMIT_CORE) failed");
- }
- }
-
- if (is_root && wp->config->chroot && *wp->config->chroot) {
- if (0 > chroot(wp->config->chroot)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chroot(%s) failed", wp->config->chroot);
- return -1;
- }
- made_chroot = 1;
- }
-
- if (wp->config->chdir && *wp->config->chdir) {
- if (0 > chdir(wp->config->chdir)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "chdir(%s) failed", wp->config->chdir);
- return -1;
- }
- }
- else if (made_chroot) {
- chdir("/");
- }
-
- if (is_root) {
- if (wp->set_gid) {
- if (0 > setgid(wp->set_gid)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setgid(%d) failed", wp->set_gid);
- return -1;
- }
- }
- if (wp->set_uid) {
- if (0 > initgroups(wp->config->user, wp->set_gid)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "initgroups(%s, %d) failed", wp->config->user, wp->set_gid);
- return -1;
- }
- if (0 > setuid(wp->set_uid)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "setuid(%d) failed", wp->set_uid);
- return -1;
- }
- }
- }
-
-#ifdef HAVE_PRCTL
- if (0 > prctl(PR_SET_DUMPABLE, 1, 0, 0, 0)) {
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "prctl(PR_SET_DUMPABLE) failed");
- }
-#endif
-
- if (0 > fpm_clock_init()) {
- return -1;
- }
-
- return 0;
-}
-
-int fpm_unix_init_main()
-{
- struct fpm_worker_pool_s *wp;
-
- fpm_pagesize = getpagesize();
-
- if (fpm_global_config.daemonize) {
-
- switch (fork()) {
-
- case -1 :
-
- zlog(ZLOG_STUFF, ZLOG_SYSERROR, "fork() failed");
- return -1;
-
- case 0 :
-
- break;
-
- default :
-
- fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT);
- exit(0);
-
- }
-
- }
-
- setsid();
-
- if (0 > fpm_clock_init()) {
- return -1;
- }
-
- fpm_globals.parent_pid = getpid();
-
- for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
-
- if (0 > fpm_unix_conf_wp(wp)) {
- return -1;
- }
-
- }
-
- fpm_stdio_init_final();
-
- {
- struct rlimit r;
- getrlimit(RLIMIT_NOFILE, &r);
-
- zlog(ZLOG_STUFF, ZLOG_NOTICE, "getrlimit(nofile): max:%lld, cur:%lld",
- (long long) r.rlim_max, (long long) r.rlim_cur);
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_unix.h b/sapi/fpm/fpm/fpm_unix.h
deleted file mode 100644
index 3451db1..0000000
--- a/sapi/fpm/fpm/fpm_unix.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
- /* $Id: fpm_unix.h,v 1.8 2008/05/25 13:21:13 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_UNIX_H
-#define FPM_UNIX_H 1
-
-#include "fpm_worker_pool.h"
-
-int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp);
-int fpm_unix_init_child(struct fpm_worker_pool_s *wp);
-int fpm_unix_init_main();
-
-extern size_t fpm_pagesize;
-
-#endif
-
diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c
deleted file mode 100644
index 49dd5a8..0000000
--- a/sapi/fpm/fpm/fpm_worker_pool.c
+++ /dev/null
@@ -1,69 +0,0 @@
-
- /* $Id: fpm_worker_pool.c,v 1.15.2.1 2008/12/13 03:21:18 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "fpm_worker_pool.h"
-#include "fpm_cleanup.h"
-#include "fpm_children.h"
-#include "fpm_shm.h"
-#include "fpm_shm_slots.h"
-#include "fpm_conf.h"
-
-struct fpm_worker_pool_s *fpm_worker_all_pools;
-
-static void fpm_worker_pool_cleanup(int which, void *arg)
-{
- struct fpm_worker_pool_s *wp, *wp_next;
-
- for (wp = fpm_worker_all_pools; wp; wp = wp_next) {
- wp_next = wp->next;
- fpm_worker_pool_config_free(wp->config);
- fpm_children_free(wp->children);
- fpm_array_free(&wp->slots_used);
- fpm_array_free(&wp->slots_free);
- fpm_shm_free_list(wp->shm_list, which == FPM_CLEANUP_CHILD ? fpm_shm_slots_mem() : 0);
- free(wp->config);
- free(wp->user);
- free(wp->home);
- free(wp);
- }
-
- fpm_worker_all_pools = 0;
-}
-
-struct fpm_worker_pool_s *fpm_worker_pool_alloc()
-{
- struct fpm_worker_pool_s *ret;
-
- ret = malloc(sizeof(struct fpm_worker_pool_s));
-
- if (!ret) {
- return 0;
- }
-
- memset(ret, 0, sizeof(struct fpm_worker_pool_s));
-
- if (!fpm_worker_all_pools) {
- fpm_worker_all_pools = ret;
- }
-
- fpm_array_init(&ret->slots_used, sizeof(struct fpm_shm_slot_ptr_s), 50);
- fpm_array_init(&ret->slots_free, sizeof(struct fpm_shm_slot_ptr_s), 50);
-
- return ret;
-}
-
-int fpm_worker_pool_init_main()
-{
- if (0 > fpm_cleanup_add(FPM_CLEANUP_ALL, fpm_worker_pool_cleanup, 0)) {
- return -1;
- }
-
- return 0;
-}
diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h
deleted file mode 100644
index cc0dbbd..0000000
--- a/sapi/fpm/fpm/fpm_worker_pool.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
- /* $Id: fpm_worker_pool.h,v 1.13 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2007,2008 Andrei Nigmatulin */
-
-#ifndef FPM_WORKER_POOL_H
-#define FPM_WORKER_POOL_H 1
-
-#include "fpm_conf.h"
-#include "fpm_arrays.h"
-
-struct fpm_worker_pool_s;
-struct fpm_child_s;
-struct fpm_child_stat_s;
-struct fpm_shm_s;
-
-enum fpm_address_domain {
- FPM_AF_UNIX = 1,
- FPM_AF_INET = 2
-};
-
-struct fpm_worker_pool_s {
- struct fpm_worker_pool_s *next;
- struct fpm_worker_pool_config_s *config;
- char *user, *home; /* for setting env USER and HOME */
- enum fpm_address_domain listen_address_domain;
- int listening_socket;
- int set_uid, set_gid; /* config uid and gid */
- unsigned is_template:1; /* just config template, no processes will be created */
- int socket_uid, socket_gid, socket_mode;
-
- struct fpm_shm_s *shm_list;
- struct fpm_array_s slots_used;
- struct fpm_array_s slots_free;
-
- /* runtime */
- struct fpm_child_s *children;
- int running_children;
-};
-
-struct fpm_worker_pool_s *fpm_worker_pool_alloc();
-int fpm_worker_pool_init_main();
-
-extern struct fpm_worker_pool_s *fpm_worker_all_pools;
-
-#endif
-
diff --git a/sapi/fpm/fpm/xml_config.c b/sapi/fpm/fpm/xml_config.c
deleted file mode 100644
index 10eb77e..0000000
--- a/sapi/fpm/fpm/xml_config.c
+++ /dev/null
@@ -1,278 +0,0 @@
-
- /* $Id: xml_config.c,v 1.9 2008/08/26 15:09:15 anight Exp $ */
- /* (c) 2004-2007 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-#include <string.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-#include "xml_config.h"
-
-static struct xml_conf_section **xml_conf_sections = 0;
-static int xml_conf_sections_allocated = 0;
-static int xml_conf_sections_used = 0;
-
-char *xml_conf_set_slot_boolean(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- long value_y = !strcasecmp(value, "yes") || !strcmp(value, "1") || !strcasecmp(value, "on");
- long value_n = !strcasecmp(value, "no") || !strcmp(value, "0") || !strcasecmp(value, "off");
-
- if (!value_y && !value_n) {
- return "xml_conf_set_slot(): invalid boolean value";
- }
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "setting boolean '%s' => %s\n", name, value_y ? "TRUE" : "FALSE");
-#endif
-
- * (int *) ((char *) *conf + offset) = value_y ? 1 : 0;
-
- return NULL;
-}
-
-char *xml_conf_set_slot_string(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- char *v = strdup(value);
-
- if (!v) return "xml_conf_set_slot_string(): strdup() failed";
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "setting string '%s' => '%s'\n", name, v);
-#endif
-
- * (char **) ((char *) *conf + offset) = v;
-
- return NULL;
-}
-
-char *xml_conf_set_slot_integer(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- int v = atoi(value);
-
- * (int *) ((char *) *conf + offset) = v;
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "setting integer '%s' => %d\n", name, v);
-#endif
-
- return NULL;
-}
-
-char *xml_conf_set_slot_time(void **conf, char *name, void *vv, intptr_t offset)
-{
- char *value = vv;
- int len = strlen(value);
- char suffix;
- int seconds;
-
- if (!len) return "xml_conf_set_slot_timeval(): invalid timeval value";
-
- suffix = value[len-1];
-
- value[len-1] = '\0';
-
- switch (suffix) {
- case 's' :
- seconds = atoi(value);
- break;
- case 'm' :
- seconds = 60 * atoi(value);
- break;
- case 'h' :
- seconds = 60 * 60 * atoi(value);
- break;
- case 'd' :
- seconds = 24 * 60 * 60 * atoi(value);
- break;
- default :
- return "xml_conf_set_slot_timeval(): unknown suffix used in timeval value";
- }
-
- * (int *) ((char *) *conf + offset) = seconds;
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "setting time '%s' => %d:%02d:%02d:%02d\n", name, expand_dhms(seconds));
-#endif
-
- return NULL;
-}
-
-char *xml_conf_parse_section(void **conf, struct xml_conf_section *section, void *xml_node)
-{
- xmlNode *element = xml_node;
- char *ret = 0;
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "processing a section %s\n", section->path);
-#endif
-
- for ( ; element; element = element->next) {
- if (element->type == XML_ELEMENT_NODE && !strcmp((const char *) element->name, "value") && element->children) {
- xmlChar *name = xmlGetProp(element, (unsigned char *) "name");
-
- if (name) {
- int i;
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "found a value: %s\n", name);
-#endif
- for (i = 0; section->parsers[i].parser; i++) {
- if (!section->parsers[i].name || !strcmp(section->parsers[i].name, (char *) name)) {
- break;
- }
- }
-
- if (section->parsers[i].parser) {
- if (section->parsers[i].type == XML_CONF_SCALAR) {
- if (element->children->type == XML_TEXT_NODE) {
- ret = section->parsers[i].parser(conf, (char *) name, element->children->content, section->parsers[i].offset);
- }
- else {
- ret = "XML_TEXT_NODE is expected, something different is given";
- }
- }
- else {
- ret = section->parsers[i].parser(conf, (char *) name, element->children, section->parsers[i].offset);
- }
-
- xmlFree(name);
- if (ret) return ret;
- else continue;
- }
-
- fprintf(stderr, "Warning, unknown setting '%s' in section '%s'\n", (char *) name, section->path);
-
- xmlFree(name);
- }
- }
- }
-
- return NULL;
-}
-
-static char *xml_conf_parse_file(xmlNode *element)
-{
- char *ret = 0;
-
- for ( ; element; element = element->next) {
-
- if (element->parent && element->type == XML_ELEMENT_NODE && !strcmp((const char *) element->name, "section")) {
- xmlChar *name = xmlGetProp(element, (unsigned char *) "name");
-
- if (name) {
- char *parent_name = (char *) xmlGetNodePath(element->parent);
- char *full_name;
- int i;
- struct xml_conf_section *section = NULL;
-
-#ifdef XML_CONF_DEBUG
- fprintf(stderr, "got a section: %s/%s\n", parent_name, name);
-#endif
- full_name = alloca(strlen(parent_name) + strlen((char *) name) + 1 + 1);
-
- sprintf(full_name, "%s/%s", parent_name, (char *) name);
-
- xmlFree(parent_name);
- xmlFree(name);
-
- for (i = 0; i < xml_conf_sections_used; i++) {
- if (!strcmp(xml_conf_sections[i]->path, full_name)) {
- section = xml_conf_sections[i];
- }
- }
-
- if (section) { /* found a registered section */
- void *conf = section->conf();
- ret = xml_conf_parse_section(&conf, section, element->children);
- if (ret) break;
- }
-
- }
- }
-
- if (element->children) {
- ret = xml_conf_parse_file(element->children);
- if (ret) break;
- }
- }
-
- return ret;
-}
-
-char *xml_conf_load_file(char *file)
-{
- char *ret = 0;
- xmlDoc *doc;
-
- LIBXML_TEST_VERSION
-
- doc = xmlParseFile(file);
-
- if (doc) {
- ret = xml_conf_parse_file(doc->children);
- xmlFreeDoc(doc);
- }
- else {
- ret = "failed to parse conf file";
- }
-
- xmlCleanupParser();
- return ret;
-}
-
-int xml_conf_init()
-{
- return 0;
-}
-
-void xml_conf_clean()
-{
- if (xml_conf_sections) {
- free(xml_conf_sections);
- }
-}
-
-int xml_conf_section_register(struct xml_conf_section *section)
-{
- if (xml_conf_sections_allocated == xml_conf_sections_used) {
- int new_size = xml_conf_sections_used + 10;
- void *new_ptr = realloc(xml_conf_sections, sizeof(struct xml_conf_section *) * new_size);
-
- if (new_ptr) {
- xml_conf_sections = new_ptr;
- xml_conf_sections_allocated = new_size;
- }
- else {
- fprintf(stderr, "xml_conf_section_register(): out of memory\n");
- return -1;
- }
- }
-
- xml_conf_sections[xml_conf_sections_used++] = section;
-
- return 0;
-}
-
-int xml_conf_sections_register(struct xml_conf_section *sections[])
-{
- for ( ; sections && *sections; sections++) {
- if (0 > xml_conf_section_register(*sections)) {
- return -1;
- }
- }
-
- return 0;
-}
-
diff --git a/sapi/fpm/fpm/xml_config.h b/sapi/fpm/fpm/xml_config.h
deleted file mode 100644
index b6169cd..0000000
--- a/sapi/fpm/fpm/xml_config.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
- /* $Id: xml_config.h,v 1.3 2008/09/18 23:02:58 anight Exp $ */
- /* (c) 2004-2007 Andrei Nigmatulin */
-
-#ifndef XML_CONFIG_H
-#define XML_CONFIG_H 1
-
-#include <stdint.h>
-
-struct xml_value_parser;
-
-struct xml_value_parser {
- int type;
- char *name;
- char *(*parser)(void **, char *, void *, intptr_t offset);
- intptr_t offset;
-};
-
-struct xml_conf_section {
- void *(*conf)();
- char *path;
- struct xml_value_parser *parsers;
-};
-
-char *xml_conf_set_slot_boolean(void **conf, char *name, void *value, intptr_t offset);
-char *xml_conf_set_slot_string(void **conf, char *name, void *value, intptr_t offset);
-char *xml_conf_set_slot_integer(void **conf, char *name, void *value, intptr_t offset);
-char *xml_conf_set_slot_time(void **conf, char *name, void *value, intptr_t offset);
-
-int xml_conf_init();
-void xml_conf_clean();
-char *xml_conf_load_file(char *file);
-char *xml_conf_parse_section(void **conf, struct xml_conf_section *section, void *ve);
-int xml_conf_section_register(struct xml_conf_section *section);
-int xml_conf_sections_register(struct xml_conf_section *sections[]);
-
-#define expand_hms(value) (value) / 3600, ((value) % 3600) / 60, (value) % 60
-
-#define expand_dhms(value) (value) / 86400, ((value) % 86400) / 3600, ((value) % 3600) / 60, (value) % 60
-
-enum { XML_CONF_SCALAR = 1, XML_CONF_SUBSECTION = 2 };
-
-#endif
diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c
deleted file mode 100644
index 2fb6c45..0000000
--- a/sapi/fpm/fpm/zlog.c
+++ /dev/null
@@ -1,113 +0,0 @@
-
- /* $Id: zlog.c,v 1.7 2008/05/22 21:08:32 anight Exp $ */
- /* (c) 2004-2007 Andrei Nigmatulin */
-
-#include "fpm_config.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-#include <stdarg.h>
-#include <sys/time.h>
-#include <errno.h>
-
-#include "zlog.h"
-
-#define MAX_LINE_LENGTH 1024
-
-static int zlog_fd = -1;
-static int zlog_level = ZLOG_NOTICE;
-
-static const char *level_names[] = {
- [ZLOG_DEBUG] = "DEBUG",
- [ZLOG_NOTICE] = "NOTICE",
- [ZLOG_WARNING] = "WARNING",
- [ZLOG_ERROR] = "ERROR",
- [ZLOG_ALERT] = "ALERT",
-};
-
-size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len)
-{
- struct tm t;
- size_t len;
-
- len = strftime(timebuf, timebuf_len, "%b %d %H:%M:%S", localtime_r((const time_t *) &tv->tv_sec, &t));
- len += snprintf(timebuf + len, timebuf_len - len, ".%06d", (int) tv->tv_usec);
-
- return len;
-}
-
-int zlog_set_fd(int new_fd)
-{
- int old_fd = zlog_fd;
- zlog_fd = new_fd;
-
- return old_fd;
-}
-
-int zlog_set_level(int new_value)
-{
- int old_value = zlog_level;
-
- zlog_level = new_value;
-
- return old_value;
-}
-
-void zlog(const char *function, int line, int flags, const char *fmt, ...)
-{
- struct timeval tv;
- char buf[MAX_LINE_LENGTH];
- const size_t buf_size = MAX_LINE_LENGTH;
- va_list args;
- size_t len;
- int truncated = 0;
- int saved_errno;
-
- if ((flags & ZLOG_LEVEL_MASK) < zlog_level) {
- return;
- }
-
- saved_errno = errno;
-
- gettimeofday(&tv, 0);
-
- len = zlog_print_time(&tv, buf, buf_size);
-
- len += snprintf(buf + len, buf_size - len, " [%s] %s(), line %d: ", level_names[flags & ZLOG_LEVEL_MASK], function, line);
-
- if (len > buf_size - 1) {
- truncated = 1;
- }
-
- if (!truncated) {
- va_start(args, fmt);
-
- len += vsnprintf(buf + len, buf_size - len, fmt, args);
-
- va_end(args);
-
- if (len >= buf_size) {
- truncated = 1;
- }
- }
-
- if (!truncated) {
- if (flags & ZLOG_HAVE_ERRNO) {
- len += snprintf(buf + len, buf_size - len, ": %s (%d)", strerror(saved_errno), saved_errno);
- if (len >= buf_size) {
- truncated = 1;
- }
- }
- }
-
- if (truncated) {
- memcpy(buf + buf_size - sizeof("..."), "...", sizeof("...") - 1);
- len = buf_size - 1;
- }
-
- buf[len++] = '\n';
-
- write(zlog_fd > -1 ? zlog_fd : STDERR_FILENO, buf, len);
-}
diff --git a/sapi/fpm/fpm/zlog.h b/sapi/fpm/fpm/zlog.h
deleted file mode 100644
index b5ac3d9..0000000
--- a/sapi/fpm/fpm/zlog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
- /* $Id: zlog.h,v 1.7 2008/05/22 21:08:32 anight Exp $ */
- /* (c) 2004-2007 Andrei Nigmatulin */
-
-#ifndef ZLOG_H
-#define ZLOG_H 1
-
-#define ZLOG_STUFF __func__, __LINE__
-
-struct timeval;
-
-int zlog_set_fd(int new_fd);
-int zlog_set_level(int new_value);
-
-size_t zlog_print_time(struct timeval *tv, char *timebuf, size_t timebuf_len);
-
-void zlog(const char *function, int line, int flags, const char *fmt, ...)
- __attribute__ ((format(printf,4,5)));
-
-enum {
- ZLOG_DEBUG = 1,
- ZLOG_NOTICE = 2,
- ZLOG_WARNING = 3,
- ZLOG_ERROR = 4,
- ZLOG_ALERT = 5,
-};
-
-#define ZLOG_LEVEL_MASK 7
-
-#define ZLOG_HAVE_ERRNO 0x100
-
-#define ZLOG_SYSERROR (ZLOG_ERROR | ZLOG_HAVE_ERRNO)
-
-#endif
diff --git a/sapi/fpm/man/php-fpm.1.in b/sapi/fpm/man/php-fpm.1.in
deleted file mode 100644
index 2f534dd..0000000
--- a/sapi/fpm/man/php-fpm.1.in
+++ /dev/null
@@ -1,186 +0,0 @@
-.TH PHP-FPM 1 "2009" "The PHP Group" "Scripting Language"
-.SH NAME
-.TP 15
-@php_fpm_bin@ \- PHP FastCGI Process Manager 'PHP-FPM'
-.SH SYNOPSIS
-.B @php_fpm_bin@
-[options]
-.LP
-.SH DESCRIPTION
-\fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for
-Web development and can be embedded into HTML. This is a variant of PHP that will run in the background as a daemon, listening for CGI requests. Output is logged to @php_fpm_log_path@.
-.LP
-Most options are set in the configuration file. The configuration file is @php_fpm_conf_path@. By default, @php_fpm_bin@ will respond to CGI requests listening on localhost http port 9000. Therefore @php_fpm_bin@ expects your webserver to forward all requests for '.php' files to port 9000 and you should edit your webserver configuration file appropriately.
-.SH OPTIONS
-.TP 15
-.B \-C
-Do not chdir to the script's directory
-.TP
-.PD 0
-.B \-\-php\-ini \fIpath\fP|\fIfile\fP
-.TP
-.PD 1
-.B \-c \fIpath\fP|\fIfile\fP
-Look for
-.B php.ini
-file in the directory
-.IR path
-or use the specified
-.IR file
-.TP
-.PD 0
-.B \-\-no\-php\-ini
-.TP
-.PD 1
-.B \-n
-No
-.B php.ini
-file will be used
-.TP
-.PD 0
-.B \-\-define \fIfoo\fP[=\fIbar\fP]
-.TP
-.PD 1
-.B \-d \fIfoo\fP[=\fIbar\fP]
-Define INI entry
-.IR foo
-with value
-.IR bar
-.TP
-.B \-e
-Generate extended information for debugger/profiler
-.TP
-.PD 0
-.B \-\-help
-.TP
-.PD 1
-.B \-h
-This help
-.TP
-.PD 0
-.B \-\-info
-.TP
-.PD 1
-.B \-i
-PHP information and configuration
-.TP
-.PD 0
-.B \-\-modules
-.TP
-.PD 1
-.B \-m
-Show compiled in modules
-.TP
-.PD 0
-.B \-\-version
-.TP
-.PD 1
-.B \-v
-Version number
-.TP
-.PD 0
-.B \-\-fpm\-config \fIfile\fP
-.TP
-.PD 1
-.B \-\-y
-Specify alternative path to FastCGI process manager configuration file (the default is @php_fpm_conf_path@)
-.TP
-.PD 0
-.B \-\-zend\-extension \fIfile\fP
-.TP
-.PD 1
-.B \-z \fIfile\fP
-Load Zend extension
-.IR file
-.SH FILES
-.TP 15
-.B @php_fpm_bin@.conf
-The configuration file for the @php_fpm_bin@ daemon.
-.TP
-.B php.ini
-The standard php configuration file.
-.SH EXAMPLES
-You should use the init script provided to start and stop the @php_fpm_bin@ daemon. This situation applies for any unix systems which use init.d for their main process manager.
-.P
-.PD 1
-.RS
-sudo /etc/init.d/@php_fpm_bin@ start
-.RE
-.TP
-If your installation has no appropriate init script, launch @php_fpm_bin_path@ with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_pid_path@ determines whether @php_fpm_bin@ is already up and running. Once started, @php_fpm_bin@ then responds to several POSIX signals:
-.P
-.PD 0
-.RS
-.B SIGINT,SIGTERM \fPimmediate termination
-.TP
-.B SIGQUIT \fPgraceful stop
-.TP
-.B SIGUSR1 \fPre-open log file
-.TP
-.B SIGUSR2 \fPgraceful reload of all workers + reload of fpm conf/binary
-.RE
-.PD 1
-.P
-.SH TIPS
-The PHP-FPM CGI daemon will work well with most popular webservers, including Apache2, lighttpd and nginx.
-.PD 1
-.P
-.SH SEE ALSO
-The PHP-FPM website:
-.PD 0
-.P
-.B http://php-fpm.org
-.PD 1
-.P
-For a more or less complete description of PHP look here:
-.PD 0
-.P
-.B http://www.php.net/manual/
-.PD 1
-.P
-A nice introduction to PHP by Stig Bakken can be found here:
-.PD 0
-.P
-.B http://www.zend.com/zend/art/intro.php
-.PD 1
-.SH BUGS
-You can view the list of known bugs or report any new bug you
-found at:
-.PD 0
-.P
-.B http://bugs.php.net
-.PD 1
-.SH AUTHORS
-PHP-FPM SAPI was written by Andrei Nigmatulin. The mailing-lists are highload-php-en (English) and highload-php-ru (Russian).
-.P
-The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
-.P
-A List of active developers can be found here:
-.PD 0
-.P
-.B http://www.php.net/credits.php
-.PD 1
-.P
-And last but not least PHP was developed with the help of a huge amount of
-contributors all around the world.
-.SH VERSION INFORMATION
-This manpage describes \fBphp\fP, version @PHP_VERSION@, \fBfpm\fP, version @fpm_version@.
-.SH COPYRIGHT
-Copyright \(co 1997\-2009 The PHP Group
-.PD 0
-.P
-Copyright (c) 2007-2009, Andrei Nigmatulin
-.PD 1
-.LP
-This source file is subject to version 3.01 of the PHP license,
-that is bundled with this package in the file LICENSE, and is
-available through the world-wide-web at the following url:
-.PD 0
-.P
-.B http://www.php.net/license/3_01.txt
-.PD 1
-.P
-If you did not receive a copy of the PHP license and are unable to
-obtain it through the world-wide-web, please send a note to
-.B license@php.net
-so we can mail you a copy immediately.