[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/webserver init,1.4,1.5

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/webserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13439

Modified Files:
	init 
Log Message:
user.webserver.prefs.type2MIME uses tableCopyNewContents

Index: init
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/webserver/init,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** init	28 Jul 2005 06:31:43 -0000	1.4
--- init	7 Aug 2005 23:19:34 -0000	1.5
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.webserver.init
  
! ÇChanges
	Ç7/27/05; 6:07:04 PM by TAC
		Çuser.webserver.prefs.mimeTypes uses tableCopyNewContents
		Çuser.webserver.responders was only copying new items when the table was first created, now copies each init
		Çadded user.webserver.prefs.MIME2Binary
	Ç7/14/05; 12:29:45 AM by TAC
		Çuser.webserver.responders init now uses tableCopyNewContents
		Çadded tableCopyNewContents handler
		Çadded user.inetd.config.http3, edit Manila sites
		Çmoved port config for Mac OS X into user.inetd.config.http init so it is only done once. it was blowing over settings the user may have put in
	Ç6/15/05; 12:55:10 PM by TAC
		Çadded port settings for Mac OS X
	Ç9/19/02; 2:28:50 AM by JES
		ÇInitialize the port 5336 listener.
	Ç8/21/02; 9:33:34 PM by JES
		ÇInitialize the commonLog prefs sub-table.
	Ç11/5/99; 7:15:29 PM by AR
		ÇSet up user.webserver.postFilters.domainStats.
		ÇSet up user.webserver.prefs.flDomainStats.
	Ç10/1/98; 6:34:12 PM by DW
		Çno longer expects certain responders to be installed
		Çno longer creates the log file for the commonLog postfilter
		Çno longer creates user.webserver.utilities if it doesn't exist
	Ç12/16/98; 5:36:45 PM by DW
		Çroll-in of features from mainResponder project
		Çuser.webserver.stats and user.webserver.prefs.flStats
	Ç3/19/99; 2:11:09 PM by PBS
		ÇNew pref: user.webserver.prefs.flWaitDuringStartup.
			ÇDefault is true. If true, Frontier waits to handle incoming http requests while starting up.
			ÇIt waits by looping in webserver.server until Frontier has started up.
			ÇPeople running Frontier behind IIS should set this to false, or else Frontier may hang during startup.
			ÇEverybody else should set it to true.

on tableCopyNewContents (sourceTableAddress, destinationTableAddress) { // 7/3/05; 9:21:16 AM by TAC
	local (adr);
	for adr in sourceTableAddress {
		if defined (destinationTableAddress^.[nameOf (adr^)]) {
			continue};
		if not (table.copy (adr, destinationTableAddress)) {
			return (false)}};
	return (true)};

bundle { //make sure inetd is set up
	inetd.init (); //this must be done before webserver will work.
	if not defined (user.inetd.config.http) {
		user.inetd.config.http = webserver.data.inetd.config.http;
		if system.environment.isCarbon { // 6/15/05; 12:54:55 PM by TAC
			user.inetd.config.http.port = 8080;
			user.inetd.config.http.apparentPort = 80}};
	if not defined (user.inetd.config.http2) {
		user.inetd.config.http2 = webserver.data.inetd.config.http2};
	if not defined (user.inetd.config.http3) {
		user.inetd.config.http3 = webserver.data.inetd.config.http3}};
bundle { //create top-level tables of user.webserver
	if not defined (user.webserver) {
		new (tableType, @user.webserver)};
	if not defined (user.webserver.prefs) {
		new (tableType, @user.webserver.prefs)};
	if not defined (user.webserver.callbacks) {
		new (tableType, @user.webserver.callbacks)};
	if not defined (user.webserver.callbacks.filterRequest) {
		new (tableType, @user.webserver.callbacks.filterRequest)};
	if not defined (user.webserver.callbacks.handleRequest) {
		new (tableType, @user.webserver.callbacks.handleRequest)};
	if not defined (user.webserver.callbacks.filterPage) {
		new (tableType, @user.webserver.callbacks.filterPage)};
	if not defined (user.webserver.cgis) {
		new (tableType, @user.webserver.cgis)};
	Çif not defined (user.webserver.utilities)
		Çnew (tableType, @user.webserver.utilities)
	if not defined (user.webserver.actions) {
		user.webserver.actions= webserver.data.actions};
	Çif not defined (user.webserver.cgis.samples)
		Çuser.webserver.cgis.samples = webserver.data.cgis.samples
	if not defined (user.webserver.preFilters) {
		user.webserver.preFilters = webserver.data.preFilters};
	if not defined (user.webserver.postFilters) {
		user.webserver.postFilters = webserver.data.postFilters}};
bundle { //copy prefs from webserver table
	if not defined (user.webserver.prefs.fileNotFoundPage) {
		user.webserver.prefs.fileNotFoundPage = webserver.data.prefs.fileNotFoundPage};
	if not defined (user.webserver.prefs.errorPage) {
		user.webserver.prefs.errorPage = webserver.data.prefs.errorPage};
	bundle { // user.webserver.prefs.mimeTypes
		if not defined (user.webserver.prefs.mimeTypes) {
			new (tableType, @user.webserver.prefs.mimeTypes)};
		tableCopyNewContents (@webserver.data.prefs.mimeTypes, @user.webserver.prefs.mimeTypes)};
	if not defined (user.webserver.prefs.ext2MIME) {
		user.webserver.prefs.ext2MIME = webserver.data.prefs.ext2MIME};
	if not defined (user.webserver.prefs.type2MIME) {
		user.webserver.prefs.type2MIME = webserver.data.prefs.type2MIME};
	if not defined (user.webserver.prefs.MIME2icon) {
		user.webserver.prefs.MIME2icon = webserver.data.prefs.MIME2icon};
	if not defined (user.webserver.prefs.MIME2name) {
		user.webserver.prefs.MIME2name = webserver.data.prefs.MIME2name};
	bundle { // user.webserver.prefs.MIME2Binary
		if not defined (user.webserver.prefs.MIME2Binary) {
			new (tableType, @user.webserver.prefs.MIME2Binary)};
		tableCopyNewContents (@webserver.data.prefs.MIME2Binary, @user.webserver.prefs.MIME2Binary)}};
bundle { //set the prefs values
	if not defined (user.webserver.prefs.chunkSize) {
		user.webserver.prefs.chunkSize = 24};
	if not defined (user.webserver.prefs.fldebug) {
		user.webserver.prefs.fldebug = false};
	if not defined (user.webserver.prefs.hostName) {
		user.webserver.prefs.hostName = ""};
	if not defined (user.webserver.prefs.serverAppID) {
		user.webserver.prefs.serverAppID = ""};
	if not defined (user.webserver.prefs.websiteFolderPath) {
		user.webserver.prefs.websiteFolderPath = ""};
	if not defined (user.webserver.prefs.fluseDNS) {
		user.webserver.prefs.fluseDNS = false};
	if not defined (user.webserver.prefs.flWaitDuringStartup) { //PBS 3/19/99
		user.webserver.prefs.flWaitDuringStartup = true};
	if not defined (user.webserver.prefs.defaultResponder) {
		user.webserver.prefs.defaultResponder = "default"};
	if not defined (user.webserver.prefs.flStats) { //6.0
		user.webserver.prefs.flStats = true};
	if not defined (user.webserver.prefs.flDomainStats) { //AR 11/05/1999
		user.webserver.prefs.flDomainStats = true}; //PBS 11/23/99: now true
	if not defined (user.webserver.prefs.commonLog) {
		new (tableType, @user.webserver.prefs.commonLog)};
	if not defined (user.webserver.prefs.commonLog.flIncludeReferers) {
		user.webserver.prefs.commonLog.flIncludeReferers = false};
	if not defined (user.webserver.prefs.commonLog.flIncludeUserAgents) {
		user.webserver.prefs.commonLog.flIncludeUserAgents = false};
	if not defined (user.webserver.prefs.commonLog.flIncludeVirtualHosts) {
		user.webserver.prefs.commonLog.flIncludeVirtualHosts = false};
	if not defined (user.webserver.prefs.commonLog.flUseCommonLogDateFormat) {
		user.webserver.prefs.commonLog.flUseCommonLogDateFormat = false}};
bundle { // user.webserver.responders
	if not defined (user.webserver.responders) {
		new (tableType, @user.webserver.responders)};
	tableCopyNewContents (@webserver.data.responders , @user.webserver.responders)};
bundle { //6.0, initialize stats
	if not defined (user.webserver.stats) {
		new (tabletype, @user.webserver.stats)};
	user.webserver.stats.maxConnections = 0;
	user.webserver.stats.maxMemAvail = 0;
	user.webserver.stats.minMemAvail = infinity;
	user.webserver.stats.hits = 0;
	user.webserver.stats.upSince = clock.now ()};
Çbundle // set up log for commonLog postFilter 
	Çif (not defined (user.webserver.prefs.logFile)) or (not file.exists (user.webserver.prefs.logFile))
		Çuser.webserver.prefs.logFile = frontier.pathstring + "Logs" + file.getPathChar () + "Web Server Log.txt"
	Çfile.sureFilePath (user.webserver.prefs.logFile)
	Çif not file.exists (user.webserver.prefs.logFile)
		Çfile.new (user.webserver.prefs.logFile)
		Çif (sys.os () == osMacOS)
			Çfile.setType (user.webserver.prefs.logFile, 'TEXT')
			Çfile.setCreator (user.webserver.prefs.logFile, 'R*ch')
bundle { //AR 11/5/99: set up domainStats postFilter
	if not defined (user.webserver.postfilters.domainStats) {
		script.newScriptObject ("on domainStats (pta)" + cr + tab + "return (webserver.postFilters.domainStats (pta))", @user.webserver.postFilters.domainStats)}};

return (true)
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.webserver.init
  
! ÇChanges
	Ç8/3/05; 10:53:06 PM by TAC
		Çuser.webserver.prefs.type2MIME uses tableCopyNewContents
	Ç7/27/05; 6:07:04 PM by TAC
		Çuser.webserver.prefs.mimeTypes uses tableCopyNewContents
		Çuser.webserver.responders was only copying new items when the table was first created, now copies each init
		Çadded user.webserver.prefs.MIME2Binary
	Ç7/14/05; 12:29:45 AM by TAC
		Çuser.webserver.responders init now uses tableCopyNewContents
		Çadded tableCopyNewContents handler
		Çadded user.inetd.config.http3, edit Manila sites
		Çmoved port config for Mac OS X into user.inetd.config.http init so it is only done once. it was blowing over settings the user may have put in
	Ç6/15/05; 12:55:10 PM by TAC
		Çadded port settings for Mac OS X
	Ç9/19/02; 2:28:50 AM by JES
		ÇInitialize the port 5336 listener.
	Ç8/21/02; 9:33:34 PM by JES
		ÇInitialize the commonLog prefs sub-table.
	Ç11/5/99; 7:15:29 PM by AR
		ÇSet up user.webserver.postFilters.domainStats.
		ÇSet up user.webserver.prefs.flDomainStats.
	Ç10/1/98; 6:34:12 PM by DW
		Çno longer expects certain responders to be installed
		Çno longer creates the log file for the commonLog postfilter
		Çno longer creates user.webserver.utilities if it doesn't exist
	Ç12/16/98; 5:36:45 PM by DW
		Çroll-in of features from mainResponder project
		Çuser.webserver.stats and user.webserver.prefs.flStats
	Ç3/19/99; 2:11:09 PM by PBS
		ÇNew pref: user.webserver.prefs.flWaitDuringStartup.
			ÇDefault is true. If true, Frontier waits to handle incoming http requests while starting up.
			ÇIt waits by looping in webserver.server until Frontier has started up.
			ÇPeople running Frontier behind IIS should set this to false, or else Frontier may hang during startup.
			ÇEverybody else should set it to true.

on tableCopyNewContents (sourceTableAddress, destinationTableAddress) { // 7/3/05; 9:21:16 AM by TAC
	local (adr);
	for adr in sourceTableAddress {
		if defined (destinationTableAddress^.[nameOf (adr^)]) {
			continue};
		if not (table.copy (adr, destinationTableAddress)) {
			return (false)}};
	return (true)};

bundle { //make sure inetd is set up
	inetd.init (); //this must be done before webserver will work.
	if not defined (user.inetd.config.http) {
		user.inetd.config.http = webserver.data.inetd.config.http;
		if system.environment.isCarbon { // 6/15/05; 12:54:55 PM by TAC
			user.inetd.config.http.port = 8080;
			user.inetd.config.http.apparentPort = 80}};
	if not defined (user.inetd.config.http2) {
		user.inetd.config.http2 = webserver.data.inetd.config.http2};
	if not defined (user.inetd.config.http3) {
		user.inetd.config.http3 = webserver.data.inetd.config.http3}};
bundle { //create top-level tables of user.webserver
	if not defined (user.webserver) {
		new (tableType, @user.webserver)};
	if not defined (user.webserver.prefs) {
		new (tableType, @user.webserver.prefs)};
	if not defined (user.webserver.callbacks) {
		new (tableType, @user.webserver.callbacks)};
	if not defined (user.webserver.callbacks.filterRequest) {
		new (tableType, @user.webserver.callbacks.filterRequest)};
	if not defined (user.webserver.callbacks.handleRequest) {
		new (tableType, @user.webserver.callbacks.handleRequest)};
	if not defined (user.webserver.callbacks.filterPage) {
		new (tableType, @user.webserver.callbacks.filterPage)};
	if not defined (user.webserver.cgis) {
		new (tableType, @user.webserver.cgis)};
	Çif not defined (user.webserver.utilities)
		Çnew (tableType, @user.webserver.utilities)
	if not defined (user.webserver.actions) {
		user.webserver.actions= webserver.data.actions};
	Çif not defined (user.webserver.cgis.samples)
		Çuser.webserver.cgis.samples = webserver.data.cgis.samples
	if not defined (user.webserver.preFilters) {
		user.webserver.preFilters = webserver.data.preFilters};
	if not defined (user.webserver.postFilters) {
		user.webserver.postFilters = webserver.data.postFilters}};
bundle { //copy prefs from webserver table
	if not defined (user.webserver.prefs.fileNotFoundPage) {
		user.webserver.prefs.fileNotFoundPage = webserver.data.prefs.fileNotFoundPage};
	if not defined (user.webserver.prefs.errorPage) {
		user.webserver.prefs.errorPage = webserver.data.prefs.errorPage};
	bundle { // user.webserver.prefs.mimeTypes
		if not defined (user.webserver.prefs.mimeTypes) {
			new (tableType, @user.webserver.prefs.mimeTypes)};
		tableCopyNewContents (@webserver.data.prefs.mimeTypes, @user.webserver.prefs.mimeTypes)};
	if not defined (user.webserver.prefs.ext2MIME) {
		user.webserver.prefs.ext2MIME = webserver.data.prefs.ext2MIME};
	bundle { // user.webserver.prefs.type2MIME
		if not defined (user.webserver.prefs.type2MIME) {
			new (tableType, @user.webserver.prefs.type2MIME)};
		tableCopyNewContents (@webserver.data.prefs.type2MIME, @user.webserver.prefs.type2MIME)};
	if not defined (user.webserver.prefs.MIME2icon) {
		user.webserver.prefs.MIME2icon = webserver.data.prefs.MIME2icon};
	if not defined (user.webserver.prefs.MIME2name) {
		user.webserver.prefs.MIME2name = webserver.data.prefs.MIME2name};
	bundle { // user.webserver.prefs.MIME2Binary
		if not defined (user.webserver.prefs.MIME2Binary) {
			new (tableType, @user.webserver.prefs.MIME2Binary)};
		tableCopyNewContents (@webserver.data.prefs.MIME2Binary, @user.webserver.prefs.MIME2Binary)}};
bundle { //set the prefs values
	if not defined (user.webserver.prefs.chunkSize) {
		user.webserver.prefs.chunkSize = 24};
	if not defined (user.webserver.prefs.fldebug) {
		user.webserver.prefs.fldebug = false};
	if not defined (user.webserver.prefs.hostName) {
		user.webserver.prefs.hostName = ""};
	if not defined (user.webserver.prefs.serverAppID) {
		user.webserver.prefs.serverAppID = ""};
	if not defined (user.webserver.prefs.websiteFolderPath) {
		user.webserver.prefs.websiteFolderPath = ""};
	if not defined (user.webserver.prefs.fluseDNS) {
		user.webserver.prefs.fluseDNS = false};
	if not defined (user.webserver.prefs.flWaitDuringStartup) { //PBS 3/19/99
		user.webserver.prefs.flWaitDuringStartup = true};
	if not defined (user.webserver.prefs.defaultResponder) {
		user.webserver.prefs.defaultResponder = "default"};
	if not defined (user.webserver.prefs.flStats) { //6.0
		user.webserver.prefs.flStats = true};
	if not defined (user.webserver.prefs.flDomainStats) { //AR 11/05/1999
		user.webserver.prefs.flDomainStats = true}; //PBS 11/23/99: now true
	if not defined (user.webserver.prefs.commonLog) {
		new (tableType, @user.webserver.prefs.commonLog)};
	if not defined (user.webserver.prefs.commonLog.flIncludeReferers) {
		user.webserver.prefs.commonLog.flIncludeReferers = false};
	if not defined (user.webserver.prefs.commonLog.flIncludeUserAgents) {
		user.webserver.prefs.commonLog.flIncludeUserAgents = false};
	if not defined (user.webserver.prefs.commonLog.flIncludeVirtualHosts) {
		user.webserver.prefs.commonLog.flIncludeVirtualHosts = false};
	if not defined (user.webserver.prefs.commonLog.flUseCommonLogDateFormat) {
		user.webserver.prefs.commonLog.flUseCommonLogDateFormat = false}};
bundle { // user.webserver.responders
	if not defined (user.webserver.responders) {
		new (tableType, @user.webserver.responders)};
	tableCopyNewContents (@webserver.data.responders , @user.webserver.responders)};
bundle { //6.0, initialize stats
	if not defined (user.webserver.stats) {
		new (tabletype, @user.webserver.stats)};
	user.webserver.stats.maxConnections = 0;
	user.webserver.stats.maxMemAvail = 0;
	user.webserver.stats.minMemAvail = infinity;
	user.webserver.stats.hits = 0;
	user.webserver.stats.upSince = clock.now ()};
Çbundle // set up log for commonLog postFilter 
	Çif (not defined (user.webserver.prefs.logFile)) or (not file.exists (user.webserver.prefs.logFile))
		Çuser.webserver.prefs.logFile = frontier.pathstring + "Logs" + file.getPathChar () + "Web Server Log.txt"
	Çfile.sureFilePath (user.webserver.prefs.logFile)
	Çif not file.exists (user.webserver.prefs.logFile)
		Çfile.new (user.webserver.prefs.logFile)
		Çif (sys.os () == osMacOS)
			Çfile.setType (user.webserver.prefs.logFile, 'TEXT')
			Çfile.setCreator (user.webserver.prefs.logFile, 'R*ch')
bundle { //AR 11/5/99: set up domainStats postFilter
	if not defined (user.webserver.postfilters.domainStats) {
		script.newScriptObject ("on domainStats (pta)" + cr + tab + "return (webserver.postFilters.domainStats (pta))", @user.webserver.postFilters.domainStats)}};

return (true)
\ No newline at end of file