components/apache2/patches/httpd.conf.patch
changeset 4696 96b9957387bf
parent 278 77b380ba9d84
--- a/components/apache2/patches/httpd.conf.patch	Wed Jul 08 14:00:24 2015 -0700
+++ b/components/apache2/patches/httpd.conf.patch	Tue Jul 21 08:35:55 2015 -0700
@@ -13,7 +13,7 @@
  # Do NOT simply read the instructions in here without understanding
  # what they do.  They're here only as hints or reminders.  If you are unsure
  # consult the online docs. You have been warned.  
[email protected]@ -43,14 +49,17 @@
[email protected]@ -44,14 +50,17 @@
  # Dynamic Shared Object (DSO) Support
  #
  # To be able to use the functionality of a module which was built as a DSO you
@@ -38,7 +38,7 @@
  @@[email protected]@
  
  <IfModule !mpm_netware_module>
[email protected]@ -63,8 +72,8 @@
[email protected]@ -64,8 +73,8 @@
  # It is usually good practice to create a dedicated user and group for
  # running httpd, as with most system services.
  #
@@ -49,7 +49,7 @@
  
  </IfModule>
  </IfModule>
[email protected]@ -86,7 +95,7 @@
[email protected]@ -87,7 +96,7 @@
  # e-mailed.  This address appears on some server-generated pages, such
  # as error documents.  e.g. [email protected]
  #
@@ -58,7 +58,7 @@
  
  #
  # ServerName gives the name and port that the server uses to identify itself.
[email protected]@ -95,7 +104,7 @@
[email protected]@ -96,7 +105,7 @@
  #
  # If your host doesn't have a registered DNS name, enter its IP address here.
  #
@@ -67,7 +67,7 @@
  
  #
  # DocumentRoot: The directory out of which you will serve your
[email protected]@ -329,6 +338,10 @@
[email protected]@ -330,6 +339,10 @@
      #
      #AddType text/html .shtml
      #AddOutputFilter INCLUDES .shtml
@@ -78,7 +78,7 @@
  </IfModule>
  
  #
[email protected]@ -362,43 +375,22 @@
[email protected]@ -370,43 +383,22 @@
  
  # Supplemental configuration
  #