Update of /cvsroot/hcoop/domtool2/src/plugins
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28000/src/plugins
Modified Files:
apache.sml
Log Message:
HCoop IP synonyms; PhpVersion env var
Index: apache.sml
===================================================================
RCS file: /cvsroot/hcoop/domtool2/src/plugins/apache.sml,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** apache.sml 18 Feb 2008 15:52:40 -0000 1.76
--- apache.sml 18 Feb 2008 17:17:44 -0000 1.77
***************
*** 146,150 ****
("SuExec",
(TBase "suexec_flag", dl),
! (fn () => (EVar "true", dl)))]
val () = app Defaults.registerDefault defaults
--- 146,153 ----
("SuExec",
(TBase "suexec_flag", dl),
! (fn () => (EVar "true", dl))),
! ("PhpVersion",
! (TBase "php_version", dl),
! (fn () => (EVar "php4", dl)))]
val () = app Defaults.registerDefault defaults
***************
*** 441,444 ****
--- 444,451 ----
app (TextIO.closeOut o #2) (!vhostFiles))
+ val php_version = fn (EVar "php4", _) => SOME 4
+ | (EVar "php5", _) => SOME 5
+ | _ => NONE
+
fun vhostBody (env, makeFullHost) =
let
***************
*** 451,454 ****
--- 458,462 ----
val sadmin = Env.env Env.string (env, "ServerAdmin")
val suexec = Env.env Env.bool (env, "SuExec")
+ val php = Env.env php_version (env, "PhpVersion")
val fullHost = makeFullHost (Domain.currentDomain ())
***************
*** 516,519 ****
--- 524,534 ----
TextIO.output (file, "/DAVLock");
+ if php <> Config.Apache.defaultPhpVersion then
+ (TextIO.output (file, "\n\tAddHandler
x-httpd-php");
+ TextIO.output (file, Int.toString php);
+ TextIO.output (file, " .php .phtml"))
+ else
+ ();
+
(ld, file)
end)
***************
*** 999,1006 ****
write "\"\n"))
- val php_version = fn (EVar "php4", _) => SOME 4
- | (EVar "php5", _) => SOME 5
- | _ => NONE
-
val () = Env.action_one "phpVersion"
("version", php_version)
--- 1014,1017 ----
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
hcoop-cvs mailing list
hcoop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hcoop-cvs
