From 5edc50888d7e1328919c0e60b6baeb0eb5dd02ba Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 1 Mar 2016 10:12:29 -0300 Subject: [PATCH] Bug 15721: (QA followup) pick the most probable first Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com (cherry picked from commit 16548d39840c92d43a64ca08f63231156935c41c) Signed-off-by: Julian Maurice --- C4/Context.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Context.pm b/C4/Context.pm index 1a930b9b0e..9f3da968af 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -1102,9 +1102,9 @@ sub get_versions { { no warnings qw(exec); # suppress warnings if unable to find a program in $PATH $versions{mysqlVersion} = `mysql -V`; - $versions{apacheVersion} = `httpd -v`; + $versions{apacheVersion} = (`apache2ctl -v`)[0]; + $versions{apacheVersion} = `httpd -v` unless $versions{apacheVersion} ; $versions{apacheVersion} = `httpd2 -v` unless $versions{apacheVersion} ; - $versions{apacheVersion} = (`apache2ctl -v`)[0] unless $versions{apacheVersion} ; $versions{apacheVersion} = `apache2 -v` unless $versions{apacheVersion} ; $versions{apacheVersion} = `/usr/sbin/apache2 -v` unless $versions{apacheVersion} ; } -- 2.39.5