diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..ca6bbc3 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,5 @@ +autom4te.cache +config.log +config.mak +config.status +gsweb.make diff --git a/ChangeLog b/ChangeLog index 1a3d1a4..cac938e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,10 +4,18 @@ * configure.ac: Ditto. * configure: Regenerate. - * GSWeb.framework/.cvsignore: New file. + * .cvsignore: New file. + * GSWeb.framework/.cvsignore: Ditto. * GSWExtensions.framework/.cvsignore: Ditto. * GSWExtensions.framework/French.lproj/.cvsignore: Ditto. * GSWExtensionsGSW.framework/.cvsignore: Ditto. + + * GSWeb.framework/GSWApplication.h/m + (-/+[GSWApplication isDirectConnectEnabled]) + (-/+[GSWApplication setDirectConnectEnabled:]): Make class + methods. + ([GSWApplication registerRequestHandlers]): Call class method. + ([GSWApplication refuseNewSessions:]): Ditto. 2004-01-12 David Ayers diff --git a/GSWExtensions.framework/.cvsignore b/GSWExtensions.framework/.cvsignore index 5d42f62..9657181 100644 --- a/GSWExtensions.framework/.cvsignore +++ b/GSWExtensions.framework/.cvsignore @@ -2,3 +2,5 @@ derived_src shared_debug_obj GSWWOReplaceScript.sed WO*.wo +WOExtensions.framework +GSWExtensions.framework diff --git a/GSWExtensionsGSW.framework/.cvsignore b/GSWExtensionsGSW.framework/.cvsignore index 436589d..86a8718 100644 --- a/GSWExtensionsGSW.framework/.cvsignore +++ b/GSWExtensionsGSW.framework/.cvsignore @@ -2,4 +2,5 @@ derived_src shared_debug_obj GSWWOReplaceScript.sed WO*.wo +GSWExtensionsGSW.framework WOExtensionsGSW.framework diff --git a/GSWeb.framework/.cvsignore b/GSWeb.framework/.cvsignore index 3a8f6e5..3d4eb93 100644 --- a/GSWeb.framework/.cvsignore +++ b/GSWeb.framework/.cvsignore @@ -1,5 +1,6 @@ derived_src shared_debug_obj +GSWeb.framework WebObjects.framework config.h Makefile.preamble diff --git a/GSWeb.framework/GSWApplication.h b/GSWeb.framework/GSWApplication.h index 6a2b6b0..e0bb945 100644 --- a/GSWeb.framework/GSWApplication.h +++ b/GSWeb.framework/GSWApplication.h @@ -522,8 +522,8 @@ extern BOOL WOStrictFlag; +(void)setStatusDebuggingEnabled:(BOOL)flag;//NDFN +(BOOL)autoOpenInBrowser; +(void)setAutoOpenInBrowser:(BOOL)flag; --(BOOL)isDirectConnectEnabled; --(void)setDirectConnectEnabled:(BOOL)flag; ++(BOOL)isDirectConnectEnabled; ++(void)setDirectConnectEnabled:(BOOL)flag; +(NSString*)cgiAdaptorURL; +(void)setCGIAdaptorURL:(NSString*)url; +(BOOL)isCachingEnabled; diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m index 67c7155..0fd2f2c 100644 --- a/GSWeb.framework/GSWApplication.m +++ b/GSWeb.framework/GSWApplication.m @@ -1041,7 +1041,7 @@ int GSWApplicationMain(NSString* applicationClassName, /* printf("SELFLOCK lock ThreadID=%p\n",(void*)objc_thread_id()); TmpLockBeforeDate(selfLock,[NSDate dateWithTimeIntervalSinceNow:GSLOCK_DELAY_S]); printf("SELFLOCK locked ThreadID=%p\n",(void*)objc_thread_id()); - #ifndef NDEBUG +#ifndef NDEBUG selfLockn++; selfLock_thread_id=objc_thread_id(); #endif @@ -1301,7 +1301,7 @@ selfLockn, // If direct connect enabled, add static resources handler - if ([self isDirectConnectEnabled]) + if ([[self class] isDirectConnectEnabled]) { GSWStaticResourceRequestHandler* staticResourceRequestHandler = (GSWStaticResourceRequestHandler*) [GSWStaticResourceRequestHandler handler]; @@ -4211,7 +4211,7 @@ to another instance **/ //refuseNewSessions: -(void)refuseNewSessions:(BOOL)flag { - if (flag && [self isDirectConnectEnabled]) + if (flag && [[self class] isDirectConnectEnabled]) { [NSException raise:NSInvalidArgumentException format:@"We can't refuse newSessions if direct connect enabled"]; @@ -4450,14 +4450,14 @@ to another instance **/ }; //-------------------------------------------------------------------- --(BOOL)isDirectConnectEnabled ++(BOOL)isDirectConnectEnabled { return [[[NSUserDefaults standardUserDefaults] objectForKey:GSWOPT_DirectConnectEnabled[GSWebNamingConv]] boolValue]; }; //-------------------------------------------------------------------- --(void)setDirectConnectEnabled:(BOOL)flag ++(void)setDirectConnectEnabled:(BOOL)flag { [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithBool:flag]