You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2006/03/04 20:17:21 UTC
svn commit: r383180 - in /tcl/websh/trunk/src/apachetests: access.conf
apachetest/apachetest.tcl apachetest/template.conf.tcl config.tcl srm.conf
Author: ronnie
Date: Sat Mar 4 11:17:19 2006
New Revision: 383180
URL: http://svn.apache.org/viewcvs?rev=383180&view=rev
Log:
- Apache 2.2 compatibility (module changes)
(Note that the -X option of httpd is broken in Apache 2.2, so the tests
do not run as expected. The process shown in the output
'Apache started as PID xxxx' has to be killed manually with kill -9)
- Cleanup of unused files
Removed:
tcl/websh/trunk/src/apachetests/access.conf
tcl/websh/trunk/src/apachetests/config.tcl
tcl/websh/trunk/src/apachetests/srm.conf
Modified:
tcl/websh/trunk/src/apachetests/apachetest/apachetest.tcl
tcl/websh/trunk/src/apachetests/apachetest/template.conf.tcl
Modified: tcl/websh/trunk/src/apachetests/apachetest/apachetest.tcl
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/apachetests/apachetest/apachetest.tcl?rev=383180&r1=383179&r2=383180&view=diff
==============================================================================
--- tcl/websh/trunk/src/apachetests/apachetest/apachetest.tcl (original)
+++ tcl/websh/trunk/src/apachetests/apachetest/apachetest.tcl Sat Mar 4 11:17:19 2006
@@ -21,6 +21,19 @@
mod_access access_module
mod_auth auth_module
}
+
+ ## Apache 2.2 has different names for some modules
+ array set module_assoc_22 {
+ mod_log_config config_log_module
+ mod_mime mime_module
+ mod_negotiation negotiation_module
+ mod_dir dir_module
+ mod_authz_host authz_host_module
+ mod_auth_basic auth_basic_module
+ mod_authn_file authn_file_module
+ mod_authz_user authz_user_module
+ mod_authz_groupfile authz_groupfile_module
+ }
# name of the apache binary, such as /usr/sbin/httpd
variable binname ""
# this file should be in the same directory this script is.
@@ -93,7 +106,7 @@
# we need to load the shared object in the directory above...
proc apachetest::getcompiledin { binname } {
- variable module_assoc
+ variable modules
set bin [open [list | "$binname" -l] r]
set compiledin [read $bin]
close $bin
@@ -105,8 +118,8 @@
if { $modname == "mod_so" } {
set mod_so_present 1
}
- if { [info exists module_assoc($modname)] } {
- lappend compiledin $module_assoc($modname)
+ if { [info exists modules($modname)] } {
+ lappend compiledin $modules($modname)
}
}
}
@@ -158,10 +171,19 @@
proc apachetest::determinemodules { binname } {
variable module_assoc
+ variable module_assoc_22
+ variable modules
+
+ set ver [exec $binname -v]
+ if {[regexp {Apache/1\.3\.} $ver] || [regexp {Apache/2\.0\.} $ver]} {
+ array set modules [array get module_assoc]
+ } else {
+ array set modules [array get module_assoc_22]
+ }
set compiledin [lsort [getcompiledin $binname]]
set conffile [gethttpdconf $binname]
- foreach {n k} [array get module_assoc] {
+ foreach {n k} [array get modules] {
lappend needed $k
}
set needed [lsort $needed]
Modified: tcl/websh/trunk/src/apachetests/apachetest/template.conf.tcl
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/apachetests/apachetest/template.conf.tcl?rev=383180&r1=383179&r2=383180&view=diff
==============================================================================
--- tcl/websh/trunk/src/apachetests/apachetest/template.conf.tcl (original)
+++ tcl/websh/trunk/src/apachetests/apachetest/template.conf.tcl Sat Mar 4 11:17:19 2006
@@ -7,9 +7,6 @@
PidFile "$CWD/httpd.pid"
-#ResourceConfig "$CWD/srm.conf"
-#AccessConfig "$CWD/access.conf"
-
Timeout 300
MaxRequestsPerChild 0
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org