diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-19 14:45:55 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-27 16:39:31 +0100 |
| commit | e25a025f9ed15f37c114e84484df3d77d392c09a (patch) | |
| tree | fedba4f58018fbaedf21b604a60d1546adc24b55 /meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch | |
| parent | b7a91f226ac6f6138a0d975117d37488886b9f38 (diff) | |
| download | meta-openembedded-contrib-e25a025f9ed15f37c114e84484df3d77d392c09a.tar.gz | |
apache2: update to 2.4.6
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch')
| -rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch b/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch deleted file mode 100644 index 584ddc8d94..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch +++ /dev/null @@ -1,52 +0,0 @@ -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 - |