summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch
blob: 584ddc8d94b11ac27bfd2d7e9bdef9bde5971fe9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
From 760ccbb2fb046621a2aeaecabb2b1ef9aa280cf1 Mon Sep 17 00:00:00 2001
From: Yulong Pei <Yulong.pei@windriver.com>
Date: Thu, 1 Sep 2011 01:03:14 +0800
Subject: [PATCH] replace lynx to curl in apachectl script

Upstream-Status: Inappropriate [configuration]

Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
---
 support/apachectl.in |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/support/apachectl.in b/support/apachectl.in
index d4dff38..109ea13 100644
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -51,11 +51,11 @@ fi
 # a command that outputs a formatted text version of the HTML at the
 # url given on the command line.  Designed for lynx, however other
 # programs may work.  
-LYNX="@LYNX_PATH@ -dump"
+CURL="/usr/bin/curl"
 #
 # the URL to your server's mod_status status page.  If you do not
 # have one, then status and fullstatus will not work.
-STATUSURL="http://localhost:@PORT@/server-status"
+STATUSURL="http://localhost:@PORT@/"
 #
 # Set this variable to a command that increases the maximum
 # number of file descriptors allowed per child process. This is
@@ -91,10 +91,16 @@ configtest)
     ERROR=$?
     ;;
 status)
-    $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
+    $CURL -s $STATUSURL | grep -o "It works!"
+    if [ $? != 0 ] ; then
+        echo The httpd server does not work!
+    fi
     ;;
 fullstatus)
-    $LYNX $STATUSURL
+    $CURL -s $STATUSURL | grep -o "It works!"
+    if [ $? != 0 ] ; then
+        echo The httpd server does not work!
+    fi
     ;;
 *)
     $HTTPD $ARGV
-- 
1.6.4