- move global Alias and ScriptAlias directives to slot 80 (but still load module...

  This is to make it possible to have overrides for programs in /cgi-bin dir:
   ScriptAlias /cgi-bin/program1.cgi  /usr/lib/cgi-bin/program1/program1.cgi
   ScriptAlias /cgi-bin/programN.cgi  /usr/lib/cgi-bin/programN.cgi
   ScriptAlias /cgi-bin/programM.cgi  /usr/lib/cgi-bin/program1/program1.cgi
   ScriptAlias /cgi-bin/ /home/services/httpd/cgi-bin

Changed files:
    apache1-mod_alias.conf -> 1.2
    apache1.spec -> 1.100

diff --git a/apache1-mod_alias.conf b/apache1-mod_alias.conf
index 31d4e6d64264165acbe646029962a6d156199350..588ee3bcc9a8ac77fa73d0c5664ef7956f63cb88 100644 (file)
--- a/apache1-mod_alias.conf
+++ b/apache1-mod_alias.conf
@@ -1,8 +1,7 @@
 # $Id$
-LoadModule alias_module       modules/mod_alias.so
 
 <IfModule mod_alias.c>
-# Aliases: Add here as many aliases as you need (with no limit). The format is 
+# Aliases: Add here as many aliases as you need (with no limit). The format is
 # Alias fakename realname
 #
 # Note that if you include a trailing / on fakename then the server will

diff --git a/apache1.spec b/apache1.spec
index 54adf5d921dba897cb79987d1b6352b315e49cec..4193c3c3ff7afaed7a4bd1daa9e11db71401f0f3 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -30,7 +30,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.33
-Release:       6
+Release:       6.3
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -1322,7 +1322,7 @@ install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
 
 echo "LoadModule access_module      modules/mod_access.so" > $CFG/01_mod_access.conf
-install %{SOURCE17}    $CFG/02_mod_alias.conf
+echo "LoadModule alias_module       modules/mod_alias.so" > $CFG/02_mod_alias.conf
 echo "LoadModule asis_module        modules/mod_asis.so" > $CFG/03_mod_asis.conf
 install %{SOURCE21} $CFG/04_mod_cern_meta.conf
 echo "LoadModule cgi_module         modules/mod_cgi.so" > $CFG/05_mod_cgi.conf
@@ -1362,6 +1362,7 @@ echo "LoadModule log_forensic_module      modules/mod_log_forensic.so" > $CFG/75_mod_
 echo "LoadModule mmap_static_module    modules/mod_mmap_static.so" > $CFG/76_mod_mmap_static.conf
 install %{SOURCE13} $CFG/77_mod_info.conf
 install %{SOURCE24}    $CFG/80_errordocs.conf
+install %{SOURCE17}    $CFG/80_mod_alias.conf
 
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit