From: Jérôme Loyet <fat@php.net>
Date: Tue, 7 Sep 2010 22:03:43 +0000 (+0000)
Subject: - remove FPM specific version which is irrelevant since FPM integration into core.
X-Git-Tag: php-5.3.4RC1~265
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a1623dc5f8382a76b039e9abfab37e5449aa866;p=php

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

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 4ad8db8e1e..6a2105d1e6 100644
--- a/sapi/fpm/config.m4
+++ b/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])
 
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index be4964d53a..a1862b559d 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/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();
diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
index 5565d38c56..e91aff8605 100644
--- a/sapi/fpm/php-fpm.8.in
+++ b/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