From b0ae354c4edd5c6d5bc1b470922b9780253ca104 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Thu, 25 Mar 2004 05:33:06 +0000 Subject: [PATCH] apache 2.0 is now the default --- docs/changelog/6.x.x.txt | 2 ++ docs/gotcha.txt | 9 +++++++++ sbin/preload.perl | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index add431d33..42be62998 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -5,6 +5,8 @@ = Fixed bug [ 910145 ] htmlArea - insert image not working (Len Kranendonk / Andreas Graf). - Bugfix 914825 / 912203: Bug in template system (LenK). + - Apache 2.0 is now the default web server for WebGUI. See gotcha.txt for + details. 6.0.0 diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 706ae367d..bfd8b5aad 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -8,6 +8,15 @@ versions. Be sure to heed the warnings contained herein as they will save you many hours of grief. +6.0.1 +-------------------------------------------------------------------- + * Apache 2.0 is now the recommended web server for WebGUI. As such + sbin/preload.perl has been defaulted for use with mod_perl + 2.0. If you are still using Apache 1.3, don't worry, WebGUI + will still work great for you. You just need to edit + sbin/preload.perl to match your environment. + + 6.0.0 -------------------------------------------------------------------- * As part of the upgrade process our scripts will attempt to diff --git a/sbin/preload.perl b/sbin/preload.perl index 1f009d24a..aa39b223d 100644 --- a/sbin/preload.perl +++ b/sbin/preload.perl @@ -10,8 +10,8 @@ $ENV{GATEWAY_INTERFACE} =~ /^CGI-Perl/ or die "GATEWAY_INTERFACE not Perl!"; #---------------------------------------- # Enable the mod_perl environment. #---------------------------------------- -use Apache::Registry (); # Uncomment this for use with mod_perl 1.0 -#use ModPerl::Registry (); # Uncomment this for use with mod_perl 2.0 +#use Apache::Registry (); # Uncomment this for use with mod_perl 1.0 +use ModPerl::Registry (); # Uncomment this for use with mod_perl 2.0 #----------------------------------------