<hr /><i>ron added on 2010-11-09 09:01:37:</i><br />
Reverted your fixes, because they cause problems with certain CGI scripts scenarios (e.g. if the CGI script is named a valid fossil command prefix).

Instead, check for '-nocgi' option and disable automatic 'cgi' if it is present.

[1b883d49cf0885c74f1324b545caf28aafec385a]