From 35be91f9ec4348d4ea7a249fff3bf7e116c6405e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 1 Oct 2010 19:13:28 +0200
Subject: httpd 2.3.8 first work

---
 httpd-2.3.8-apctl.patch | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 httpd-2.3.8-apctl.patch

(limited to 'httpd-2.3.8-apctl.patch')

diff --git a/httpd-2.3.8-apctl.patch b/httpd-2.3.8-apctl.patch
new file mode 100644
index 0000000..174d100
--- /dev/null
+++ b/httpd-2.3.8-apctl.patch
@@ -0,0 +1,97 @@
+diff -up httpd-2.3.8/support/apachectl.in.apctl httpd-2.3.8/support/apachectl.in
+--- httpd-2.3.8/support/apachectl.in.apctl	2009-04-23 19:45:41.000000000 +0200
++++ httpd-2.3.8/support/apachectl.in	2010-10-01 18:25:41.040624098 +0200
+@@ -44,19 +44,25 @@ ARGV="$@"
+ # the path to your httpd binary, including options if necessary
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+-# pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+-  . @exp_sbindir@/envvars
+-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"
++if [ -x "@LYNX_PATH@" ]; then
++  LYNX="@LYNX_PATH@ -dump"
++else
++  LYNX=none
++fi
+ #
+ # 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"
++
++# Source /etc/sysconfig/httpd for $HTTPD setting, etc.
++if [ -r /etc/sysconfig/httpd ]; then
++   . /etc/sysconfig/httpd
++fi
++
+ #
+ # Set this variable to a command that increases the maximum
+ # number of file descriptors allowed per child process. This is
+@@ -76,29 +82,51 @@ if [ "x$ARGV" = "x" ] ; then 
+     ARGV="-h"
+ fi
+ 
++function checklynx() {
++if [ "$LYNX" = "none" ]; then
++   echo "The 'links' package is required for this functionality."
++   exit 8
++fi
++}
++
++function testconfig() {
++# httpd is denied terminal access in SELinux, so run in the
++# current context to get stdout from $HTTPD -t.
++if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
++  runcon -- `id -Z` $HTTPD $OPTIONS -t
++else
++  $HTTPD $OPTIONS -t
++fi
++ERROR=$?
++}
++
+ case $ACMD in
+-start|stop|restart|graceful|graceful-stop)
+-    $HTTPD -k $ARGV
+-    ERROR=$?
++restart|graceful)
++    if $HTTPD $OPTIONS -t >&/dev/null; then
++       $HTTPD $OPTIONS -k $ARGV
++       ERROR=$?
++    else
++       echo "apachectl: Configuration syntax error, will not run \"$ARGV\":"
++       testconfig
++    fi
+     ;;
+-startssl|sslstart|start-SSL)
+-    echo The startssl option is no longer supported.
+-    echo Please edit httpd.conf to include the SSL configuration settings
+-    echo and then use "apachectl start".
+-    ERROR=2
++start|stop|graceful-stop)
++    $HTTPD $OPTIONS -k $ARGV
++    ERROR=$?
+     ;;
+ configtest)
+-    $HTTPD -t
+-    ERROR=$?
++    testconfig
+     ;;
+ status)
++    checklynx
+     $LYNX $STATUSURL | awk ' /process$/ { print; exit } { print } '
+     ;;
+ fullstatus)
++    checklynx
+     $LYNX $STATUSURL
+     ;;
+ *)
+-    $HTTPD "$@"
++    $HTTPD $OPTIONS "$@"
+     ERROR=$?
+ esac
+ 
-- 
cgit