--- /opt/webvm_scripts/files/httpd.conf	2010-12-22 22:39:16.892223149 -0800
+++ httpd.conf	2010-05-28 00:11:06.000000000 -0700
@@ -58,36 +58,35 @@
 
 #
 # PidFile: The file in which the server should record its process
-# identification number when it starts.
+# identification number when it starts.  Note the PIDFILE variable in
+# /etc/sysconfig/httpd must be set appropriately if this location is
+# changed.
 #
 PidFile run/httpd.pid
 
 #
 # Timeout: The number of seconds before receives and sends time out.
 #
-Timeout 120
+Timeout 60
 
 #
 # KeepAlive: Whether or not to allow persistent connections (more than
 # one request per connection). Set to "Off" to deactivate.
 #
-#KeepAlive Off
-KeepAlive On
+KeepAlive Off
 
 #
 # MaxKeepAliveRequests: The maximum number of requests to allow
 # during a persistent connection. Set to 0 to allow an unlimited amount.
 # We recommend you leave this number high, for maximum performance.
 #
-#MaxKeepAliveRequests 100
-MaxKeepAliveRequests 0
+MaxKeepAliveRequests 100
 
 #
 # KeepAliveTimeout: Number of seconds to wait for the next request from the
 # same client on the same connection.
 #
-#KeepAliveTimeout 15
-KeepAliveTimeout 5
+KeepAliveTimeout 15
 
 ##
 ## Server-Pool Size Regulation (MPM specific)
@@ -101,12 +100,12 @@
 # MaxClients: maximum number of server processes allowed to start
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule prefork.c>
-StartServers      20
-MinSpareServers   20
+StartServers       8
+MinSpareServers    5
 MaxSpareServers   20
-ServerLimit      1536
-MaxClients       1536
-MaxRequestsPerChild  8000
+ServerLimit      256
+MaxClients       256
+MaxRequestsPerChild  4000
 </IfModule>
 
 # worker MPM
@@ -117,8 +116,8 @@
 # ThreadsPerChild: constant number of worker threads in each server process
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule worker.c>
-StartServers         2
-MaxClients         150
+StartServers         4
+MaxClients         300
 MinSpareThreads     25
 MaxSpareThreads     75 
 ThreadsPerChild     25
@@ -135,7 +134,6 @@
 #
 #Listen 12.34.56.78:80
 Listen 80
-Listen 81
 
 #
 # Dynamic Shared Object (DSO) Support
@@ -188,24 +186,34 @@
 LoadModule speling_module modules/mod_speling.so
 LoadModule userdir_module modules/mod_userdir.so
 LoadModule alias_module modules/mod_alias.so
-#LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule substitute_module modules/mod_substitute.so
+LoadModule rewrite_module modules/mod_rewrite.so
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
 LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
+LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
 LoadModule proxy_connect_module modules/mod_proxy_connect.so
 LoadModule cache_module modules/mod_cache.so
 LoadModule suexec_module modules/mod_suexec.so
 LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule file_cache_module modules/mod_file_cache.so
-LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule cgi_module modules/mod_cgi.so
+LoadModule version_module modules/mod_version.so
 
 #
 # The following modules are not loaded by default:
 #
-#LoadModule cern_meta_module modules/mod_cern_meta.so
 #LoadModule asis_module modules/mod_asis.so
+#LoadModule authn_dbd_module modules/mod_authn_dbd.so
+#LoadModule cern_meta_module modules/mod_cern_meta.so
+#LoadModule cgid_module modules/mod_cgid.so
+#LoadModule dbd_module modules/mod_dbd.so
+#LoadModule dumpio_module modules/mod_dumpio.so
+#LoadModule filter_module modules/mod_filter.so
+#LoadModule ident_module modules/mod_ident.so
+#LoadModule log_forensic_module modules/mod_log_forensic.so
+#LoadModule unique_id_module modules/mod_unique_id.so
+#
 
 #
 # Load config files from the config directory "/etc/httpd/conf.d".
@@ -355,11 +363,11 @@
     # of a username on the system (depending on home directory
     # permissions).
     #
-    UserDir disable
+    UserDir disabled
 
     #
     # To enable requests to /~user/ to serve the user's public_html
-    # directory, remove the "UserDir disable" line above, and uncomment
+    # directory, remove the "UserDir disabled" line above, and uncomment
     # the following line instead:
     # 
     #UserDir public_html
@@ -391,7 +399,6 @@
 # negotiated documents.  The MultiViews Option can be used for the 
 # same purpose, but it is much slower.
 #
-#DirectoryIndex index.html index.html.var index.php
 DirectoryIndex index.html index.html.var
 
 #
@@ -408,6 +415,7 @@
 <Files ~ "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </Files>
 
 #
@@ -515,7 +523,7 @@
 # For a single logfile with access, agent, and referer information
 # (Combined Logfile Format), use the following directive:
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -543,7 +551,7 @@
 Alias /icons/ "/var/www/icons/"
 
 <Directory "/var/www/icons">
-    Options Indexes MultiViews
+    Options Indexes MultiViews FollowSymLinks
     AllowOverride None
     Order allow,deny
     Allow from all
@@ -566,7 +574,6 @@
 # Alias.
 #
 ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
-ScriptAlias /fcgi-bin/ "/var/www/fcgi-bin/"
 
 #
 # "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
@@ -594,7 +601,7 @@
 # IndexOptions: Controls the appearance of server-generated directory
 # listings.
 #
-IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable
+IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8
 
 #
 # AddIcon* directives tell the server which icon to show for different
@@ -773,6 +780,12 @@
 AddType application/x-gzip .gz .tgz
 
 #
+#   MIME-types for downloading Certificates and CRLs
+#
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+#
 # AddHandler allows you to map certain file extensions to "handlers":
 # actions unrelated to filetype. These can be either built into the server
 # or added with the Action directive (see below)
@@ -782,8 +795,6 @@
 #
 #AddHandler cgi-script .cgi
 
-#AddHandler php5-script php 
-
 #
 # For files that include their own HTTP headers:
 #
@@ -996,5 +1007,3 @@
 #    ErrorLog logs/dummy-host.example.com-error_log
 #    CustomLog logs/dummy-host.example.com-access_log common
 #</VirtualHost>
-
-#AddType text/html       php
