Browse Source

- remove FPM specific version which is irrelevant since FPM integration into core.

pull/12/head
Jérôme Loyet 16 years ago
parent
commit
9a1623dc5f
  1. 3
      sapi/fpm/config.m4
  2. 1
      sapi/fpm/fpm/fpm_main.c
  3. 2
      sapi/fpm/php-fpm.8.in

3
sapi/fpm/config.m4

@ -2,7 +2,6 @@ dnl
dnl $Id$
dnl
fpm_version="0.6.5"
minimum_libevent_version="1.4.11"
PHP_ARG_ENABLE(fpm,,
@ -564,7 +563,6 @@ if test "$PHP_FPM" != "no"; then
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 @@ if test "$PHP_FPM" != "no"; then
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])

1
sapi/fpm/fpm/fpm_main.c

@ -1480,7 +1480,6 @@ static PHP_MINFO_FUNCTION(cgi)
{
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();

2
sapi/fpm/php-fpm.8.in

@ -164,7 +164,7 @@ A List of active developers can be found here:
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@.
This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@.
.SH COPYRIGHT
Copyright \(co 1997\-2009 The PHP Group
.PD 0

Loading…
Cancel
Save