fat Tue, 07 Sep 2010 22:03:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303148
Log:
- remove FPM specific version which is irrelevant since FPM integration into
core.
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
U php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
U php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.8.in
U php/php-src/trunk/sapi/fpm/config.m4
U php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
U php/php-src/trunk/sapi/fpm/php-fpm.8.in
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2010-09-07 21:12:28 UTC
(rev 303147)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/config.m4 2010-09-07 22:03:43 UTC
(rev 303148)
@@ -2,7 +2,6 @@
dnl $Id$
dnl
-fpm_version="0.6.5"
minimum_libevent_version="1.4.11"
PHP_ARG_ENABLE(fpm,,
@@ -564,7 +563,6 @@
php_fpm_group="$PHP_FPM_GROUP"
fi
- PHP_SUBST_OLD(fpm_version)
PHP_SUBST_OLD(php_fpm_user)
PHP_SUBST_OLD(php_fpm_group)
php_fpm_sysconfdir=`eval echo $sysconfdir`
@@ -572,7 +570,6 @@
php_fpm_localstatedir=`eval echo $localstatedir`
PHP_SUBST_OLD(php_fpm_localstatedir)
- AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c 2010-09-07
21:12:28 UTC (rev 303147)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_main.c 2010-09-07
22:03:43 UTC (rev 303148)
@@ -1480,7 +1480,6 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "php-fpm", "active");
- php_info_print_table_row(2, "php-fpm version", PHP_FPM_VERSION);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.8.in
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.8.in 2010-09-07 21:12:28 UTC
(rev 303147)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.8.in 2010-09-07 22:03:43 UTC
(rev 303148)
@@ -164,7 +164,7 @@
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_vers...@.
+This manpage describes \fBphp-fpm\fP, version @php_vers...@.
.SH COPYRIGHT
Copyright \(co 1997\-2009 The PHP Group
.PD 0
Modified: php/php-src/trunk/sapi/fpm/config.m4
===================================================================
--- php/php-src/trunk/sapi/fpm/config.m4 2010-09-07 21:12:28 UTC (rev
303147)
+++ php/php-src/trunk/sapi/fpm/config.m4 2010-09-07 22:03:43 UTC (rev
303148)
@@ -2,7 +2,6 @@
dnl $Id$
dnl
-fpm_version="0.6.5"
minimum_libevent_version="1.4.11"
PHP_ARG_ENABLE(fpm,,
@@ -564,7 +563,6 @@
php_fpm_group="$PHP_FPM_GROUP"
fi
- PHP_SUBST_OLD(fpm_version)
PHP_SUBST_OLD(php_fpm_user)
PHP_SUBST_OLD(php_fpm_group)
php_fpm_sysconfdir=`eval echo $sysconfdir`
@@ -572,7 +570,6 @@
php_fpm_localstatedir=`eval echo $localstatedir`
PHP_SUBST_OLD(php_fpm_localstatedir)
- AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-09-07 21:12:28 UTC (rev
303147)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-09-07 22:03:43 UTC (rev
303148)
@@ -1478,7 +1478,6 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "php-fpm", "active");
- php_info_print_table_row(2, "php-fpm version", PHP_FPM_VERSION);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
Modified: php/php-src/trunk/sapi/fpm/php-fpm.8.in
===================================================================
--- php/php-src/trunk/sapi/fpm/php-fpm.8.in 2010-09-07 21:12:28 UTC (rev
303147)
+++ php/php-src/trunk/sapi/fpm/php-fpm.8.in 2010-09-07 22:03:43 UTC (rev
303148)
@@ -164,7 +164,7 @@
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_vers...@.
+This manpage describes \fBphp-fpm\fP, version @php_vers...@.
.SH COPYRIGHT
Copyright \(co 1997\-2009 The PHP Group
.PD 0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
