Attachment 39385 Details for Bug 13486 – Bug 13486: Apache version empty in about page if Apache 2.4

[patch] Bug 13486: Apache version empty in about page if Apache 2.4

Bug-13486-Apache-version-empty-in-about-page-if-Ap.patch (text/plain), 1.82 KB, created by Jonathan Druart on 2015-05-22 09:22:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-05-22 09:22:46 UTC

Size: 1.82 KB

patch

obsolete

>From a5c18c6700f62bef1301ea50a85a7eec08f19d72 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@gmail.com>
>Date: Thu, 5 Feb 2015 14:31:55 -0300
>Subject: [PATCH] Bug 13486: Apache version empty in about page if Apache 2.4
>
>This patch makes about.pl query the running Apache version using
>the apache2ctl command. I tested it on Apache 2.2 and is backwards
>compatible (it is present in both).
>
>To test:
>( On an Apache 2.4 setup )
>- Go to the about page
>=> FAIL: "Apache version:" is empty
>- Apply the patch
>- Reload the page
>=> SUCCESS: "Apache version:" shows the correct version.
>- Sign off :-D
>
>If you have an Apache 2.2 setup to try it, verify that there are no regressions
>(trivial because you can run apache2ctl manually and verify the first result is the expecte).
>
>Regards
>
>PS. I even changed the order in which Apache version is tested because
>most people is using Debian/Ubuntu and it was the last option.
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Tested with apache 2.2/2.4, no errors
>
>Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
>Only tested with 2.4
>---
> about.pl | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/about.pl b/about.pl
>index 34c98ef..4e06ae5 100755
>--- a/about.pl
>+++ b/about.pl
>@@ -57,9 +57,10 @@ if ($^O ne 'VMS') {
> }
> my $perlVersion   = $];
> my $mysqlVersion  = `mysql -V`;
>-my $apacheVersion = `httpd -v 2> /dev/null`;
>-$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
>-$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
>+# Get Apache version
>+my $apacheVersion = (`apache2ctl -v`)[0];
>+$apacheVersion    = `httpd2 -v 2> /dev/null` unless $apacheVersion;
>+$apacheVersion    = `httpd -v 2> /dev/null` unless $apacheVersion;
> my $zebraVersion = `zebraidx -V`;
> 
> # Additional system information for warnings
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 13486: 34621 | 35674 | 39092 | 39094 | 39385