upgrade to 1.3.4

1 files changed, 29 insertions, 53 deletions

diff --git a/www/apache21/files/patch-ag b/www/apache21/files/patch-ag
index 11aedaa76270..fe3b9579cd7f 100644
--- a/www/apache21/files/patch-ag
+++ b/www/apache21/files/patch-ag
@@ -1,53 +1,29 @@
-*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
---- conf/httpd.conf-dist	Fri Jun  5 19:34:17 1998
-***************
-*** 50,56 ****
-  #  don't use Group #-1 on these systems!
-  
-  User nobody
-! Group #-1
-  
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
---- 50,56 ----
-  #  don't use Group #-1 on these systems!
-  
-  User nobody
-! Group nogroup
-  
-  # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
-***************
-*** 94,100 ****
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
-! CustomLog logs/access_log common
-  
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
---- 94,100 ----
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
-! #CustomLog logs/access_log common
-  
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
-***************
-*** 105,111 ****
-  # If you prefer a single logfile with access, agent and referer information
-  # (Combined Logfile Format) you can use the following directive.
-  
-! #CustomLog logs/access_log combined
-  
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
---- 105,111 ----
-  # If you prefer a single logfile with access, agent and referer information
-  # (Combined Logfile Format) you can use the following directive.
-  
-! CustomLog logs/access_log combined
-  
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
+--- conf/httpd.conf-dist.orig	Sat Dec 12 20:04:29 1998
++++ conf/httpd.conf-dist	Fri Jan 15 01:08:36 1999
+@@ -241,7 +241,7 @@
+ #  don't use Group #-1 on these systems!
+ #
+ User nobody
+-Group #-1
++Group nogroup
+ 
+ #
+ # ServerAdmin: Your address, where problems with the server should be
+@@ -459,7 +459,7 @@
+ # define per-<VirtualHost> access logfiles, transactions will be
+ # logged therein and *not* in this file.
+ #
+-CustomLog logs/access_log common
++#CustomLog logs/access_log common
+ 
+ #
+ # If you would like to have agent and referer logfiles, uncomment the
+@@ -472,7 +472,7 @@
+ # If you prefer a single logfile with access, agent, and referer information
+ # (Combined Logfile Format) you can 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