tony2001 Wed, 09 Dec 2009 12:14:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291917
Log:
add missing variables
use "php-fpm" as binary name
delete nginx config example
Changed paths:
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/init.d.php-fpm.in
D php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/nginx-site-conf.sample.in
U php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/init.d.php-fpm.in
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/init.d.php-fpm.in
2009-12-09 12:06:10 UTC (rev 291916)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/init.d.php-fpm.in
2009-12-09 12:14:06 UTC (rev 291917)
@@ -1,12 +1,12 @@
#! /bin/sh
### BEGIN INIT INFO
-# Provides: @php_fpm_bin@
+# Provides: php-fpm
# Required-Start: $all
# Required-Stop: $all
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: starts @php_fpm_bin@
+# Short-Description: starts php-fpm
# Description: starts the PHP FastCGI Process Manager daemon
### END INIT INFO
@@ -49,7 +49,7 @@
case "$1" in
start)
- echo -n "Starting @php_fpm_bin@ "
+ echo -n "Starting php-fpm "
$php_fpm_BIN $php_opts
@@ -69,7 +69,7 @@
;;
stop)
- echo -n "Gracefully shutting down @php_fpm_bin@ "
+ echo -n "Gracefully shutting down php-fpm "
if [ ! -r $php_fpm_PID ] ; then
echo "warning, no pid file found - php-fpm is not
running ?"
@@ -89,7 +89,7 @@
;;
force-quit)
- echo -n "Terminating @php_fpm_bin@ "
+ echo -n "Terminating php-fpm "
if [ ! -r $php_fpm_PID ] ; then
echo "warning, no pid file found - php-fpm is not
running ?"
@@ -115,10 +115,10 @@
reload)
- echo -n "Reload service @php_fpm_bin@ "
+ echo -n "Reload service php-fpm "
if [ ! -r $php_fpm_PID ] ; then
- echo "warning, no pid file found - @php_fpm_bin@ is not
running ?"
+ echo "warning, no pid file found - php-fpm is not
running ?"
exit 1
fi
Deleted:
php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/nginx-site-conf.sample.in
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/nginx-site-conf.sample.in
2009-12-09 12:06:10 UTC (rev 291916)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/conf/nginx-site-conf.sample.in
2009-12-09 12:14:06 UTC (rev 291917)
@@ -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;
- }
-}
Modified: php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-09 12:06:10 UTC
(rev 291916)
+++ php/php-src/branches/PHP_5_3_FPM/sapi/fpm/config.m4 2009-12-09 12:14:06 UTC
(rev 291917)
@@ -537,7 +537,14 @@
if test -z "$prefix" -o "$prefix" = "NONE"; then
prefix="/usr/local"
fi
+
+ if test -z "$exec_prefix" -o "$exec_prefix" = "NONE"; then
+ exec_prefix="/usr/local"
+ fi
+ php_fpm_bin_path=`eval echo "$bindir"`
+ php_fpm_bin_path="$php_fpm_bin_path/php-fpm"
+
if test -z "$php_fpm_conf_path"; then
php_fpm_conf_path=`eval echo "$sysconfdir"`
php_fpm_conf_path="$php_fpm_conf_path/php-fpm.conf"
@@ -580,6 +587,8 @@
PHP_SUBST_OLD(fpm_version)
PHP_SUBST_OLD(php_fpm_conf_dir)
+ PHP_SUBST_OLD(php_fpm_conf_path)
+ PHP_SUBST_OLD(php_fpm_bin_path)
PHP_SUBST_OLD(php_fpm_log_path)
PHP_SUBST_OLD(php_fpm_pid_path)
PHP_SUBST_OLD(php_fpm_log_dir)
@@ -602,7 +611,6 @@
[
PHP_OUTPUT(sapi/fpm/conf/php-fpm.conf:sapi/fpm/conf/php-fpm.conf.in)
PHP_OUTPUT(sapi/fpm/conf/init.d.php-fpm: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.1:sapi/fpm/man/php-fpm.1.in)
])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
