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 2005/11/14 15:22:14 UTC
svn commit: r344126 - in /tcl/websh/trunk: doc/mod_websh/conf/websh.conf
src/generic/cookie.ws3 src/tests/logtosyslog.test src/tests/msc.test
Author: ronnie
Date: Mon Nov 14 06:21:00 2005
New Revision: 344126
URL: http://svn.apache.org/viewcvs?rev=344126&view=rev
Log:
- compatibilty fixes with OSX
Modified:
tcl/websh/trunk/doc/mod_websh/conf/websh.conf
tcl/websh/trunk/src/generic/cookie.ws3
tcl/websh/trunk/src/tests/logtosyslog.test
tcl/websh/trunk/src/tests/msc.test
Modified: tcl/websh/trunk/doc/mod_websh/conf/websh.conf
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/doc/mod_websh/conf/websh.conf?rev=344126&r1=344125&r2=344126&view=diff
==============================================================================
--- tcl/websh/trunk/doc/mod_websh/conf/websh.conf (original)
+++ tcl/websh/trunk/doc/mod_websh/conf/websh.conf Mon Nov 14 06:21:00 2005
@@ -1,12 +1,12 @@
# Sample websh.conf file for mod_websh
# root of websh files
-if {[info sharedlibextension] == ".so"} {
- # Unix
- set webshroot /usr/local/websh
-} else {
+if {[info sharedlibextension] == ".dll"} {
# Windows
set webshroot "C:/Program Files/Apache Group/Websh"
+} else {
+ # Unix (.so, .dylib ...)
+ set webshroot /usr/local/websh
}
# Setup interpreter classes for mod_websh
Modified: tcl/websh/trunk/src/generic/cookie.ws3
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/generic/cookie.ws3?rev=344126&r1=344125&r2=344126&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/cookie.ws3 (original)
+++ tcl/websh/trunk/src/generic/cookie.ws3 Mon Nov 14 06:21:00 2005
@@ -168,7 +168,7 @@
scan [clock format $expsec -format "%m" -gmt true] "%d" monthNum
# monthNum is not zero based -> dummy entry in the list
set month [lindex "NaM Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" $monthNum]
- set expstr [clock format $expsec -format "$day, %d-$month-%Y %H:%M:%S %Z" -gmt true]
+ set expstr [clock format $expsec -format "$day, %d-$month-%Y %H:%M:%S GMT" -gmt true]
append cookie "; expires=$expstr"
}
}
Modified: tcl/websh/trunk/src/tests/logtosyslog.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/logtosyslog.test?rev=344126&r1=344125&r2=344126&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/logtosyslog.test (original)
+++ tcl/websh/trunk/src/tests/logtosyslog.test Mon Nov 14 06:21:00 2005
@@ -62,7 +62,7 @@
web::log info.info {toSyslog}
- set srclst [list /var/adm/messages /var/log/messages /var/log/syslog]
+ set srclst [list /var/adm/messages /var/log/messages /var/log/syslog /var/log/system.log]
## give syslog a little time to feed the message to the file
after 1000
Modified: tcl/websh/trunk/src/tests/msc.test
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/tests/msc.test?rev=344126&r1=344125&r2=344126&view=diff
==============================================================================
--- tcl/websh/trunk/src/tests/msc.test (original)
+++ tcl/websh/trunk/src/tests/msc.test Mon Nov 14 06:21:00 2005
@@ -78,7 +78,15 @@
set tmp [web::tempfile -path "/tmp/yoyoy" -prefix "prefix"]
set msg ""
if {[string match "/tmp/yoyoy*" $tmp]} {
- set msg "error: accepted $tmp"
+ global tcl_platform
+ if {"$tcl_platform(platform)" == "unix"
+ && "$tcl_platform(os)" == "Darwin"} {
+ # OSX does not complain if directory does not exist
+ # It just returns the nonexistig path anyway
+ set msg "ok"
+ } else {
+ set msg "error: accepted non-existing dir $tmp"
+ }
} elseif {[string match "*prefi*" $tmp]} {
set msg "ok"
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org