diff --git a/ChangeLog b/ChangeLog index 09312a7..df37f77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,57 @@ +2003-03-24 Manuel Guesdon + + * GSWeb.framework/GSWRequest.m: + o fix in -_getFormValuesFromMultipartFormData: + add [parser expectNoHeaders] to force body parsing as + otherwise it fail in some context (navigator/form values) + * GSWExtensions.framework/GSWCollapsibleComponentContent.m: + o use RCS_ID + * GSWExtensions.framework/GSWExceptionPage.m: + o logs + o use RCS_ID + * GSWExtensions.framework/GSWDictionaryRepetition.m: + o use RCS_ID + * GSWExtensions.framework/GSWIFrame.m: + o clean warnings + o use RCS_ID + * GSWExtensions.framework/GSWLongResponsePage.m: + o use RCS_ID + * GSWExtensions.framework/GSWMetaRefresh.m: + o use RCS_ID + * GSWExtensions.framework/GSWPageRestorationErrorPage.m: + o use RCS_ID + * GSWExtensions.framework/GSWRedirect.m: + o use RCS_ID + * GSWExtensions.framework/GSWSessionCreationErrorPage.m: + o use RCS_ID + * GSWExtensions.framework/GSWSessionRestorationErrorPage.m: + o use RCS_ID + * GSWExtensions.framework/GSWStatsPage.m: + o use RCS_ID + * GSWExtensionsGSW.framework/GSWLogin.m: + o use RCS_ID + * GSWExtensionsGSW.framework/GSWSimpleFormComponent.m: + o use RCS_ID + * GSWExtensionsGSW.framework/GSWTabComponent.m: + o use RCS_ID + * GSWExtensionsGSW.framework/GSWValidationFailureComponent.m: + o use RCS_ID + * GSWeb.framework/GSWApplication.m: + o change setIVar... by takeValue:forKey: + * GSWeb.framework/GSWElement.m: + o logs + * GSWeb.framework/GSWeb.h: + o removed NSObject+IVarAccess+PerformSel.h inclusion + * GSWeb.framework/GSWAssociation.m: + o removed commented set/getIVar + * GSWeb.framework/GSWComponent.m: + o removed commented set/getIVar + * GSWeb.framework/GSWSession.m: + o retain/release deleteContextID in -savePageInPermanentCache + (from Stéphane Corthésy ) + o retain/release deleteContextID in -_savePage:forChange + (from Stéphane Corthésy ) + 2003-03-23 David Ayers * GSWAdaptors/Apache/mod_gsweb.c : Include http_protocol.h diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.m b/GSWExtensions.framework/GSWCollapsibleComponentContent.m index c7d2b3f..f5a2187 100644 --- a/GSWExtensions.framework/GSWCollapsibleComponentContent.m +++ b/GSWExtensions.framework/GSWCollapsibleComponentContent.m @@ -1,8 +1,9 @@ /** GSWCollapsibleComponentContent.m - GSWeb: Class GSWCollapsibleComponentContent - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWCollapsibleComponentContent.h" diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.m b/GSWExtensions.framework/GSWDictionaryRepetition.m index fadc423..806f19a 100644 --- a/GSWExtensions.framework/GSWDictionaryRepetition.m +++ b/GSWExtensions.framework/GSWDictionaryRepetition.m @@ -1,8 +1,9 @@ /** GSWDictionaryRepetition.m - GSWeb: Class GSWDictionaryRepetition - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWDictionaryRepetition.h" diff --git a/GSWExtensions.framework/GSWExceptionPage.m b/GSWExtensions.framework/GSWExceptionPage.m index 6a763c8..716b42f 100644 --- a/GSWExtensions.framework/GSWExceptionPage.m +++ b/GSWExtensions.framework/GSWExceptionPage.m @@ -1,8 +1,9 @@ /** GSWExceptionPage.m - GSWeb: Class GSWExceptionPage - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWExceptionPage.h" @@ -66,9 +69,10 @@ static char rcsId[] = "$Id$"; -(NSArray*)getReasons { if (!_reasons) - { - ASSIGN(_reasons,[[_exception reason] componentsSeparatedByString:@"\n"]); - }; + { + ASSIGN(_reasons,[[_exception reason] componentsSeparatedByString:@"\n"]); + NSDebugMLog(@"_reasons=%@",_reasons); + }; return _reasons; }; @@ -83,13 +87,14 @@ static char rcsId[] = "$Id$"; -(void)setException:(NSException*)exception { ASSIGN(_exception,exception); + NSDebugMLog(@"_exception=%@",_exception); }; -(id)getTmpUserInfoValue { //If array, print it nicely if ([_tmpUserInfoValue isKindOfClass:[NSArray class]]) - return [(NSArray*)_tmpUserInfoValue componentsJoinedByString:@"\n"]; + return [(NSArray*)_tmpUserInfoValue componentsJoinedByString:@"\n"]; else return _tmpUserInfoValue; } diff --git a/GSWExtensions.framework/GSWIFrame.m b/GSWExtensions.framework/GSWIFrame.m index 73f32df..246c0ec 100644 --- a/GSWExtensions.framework/GSWIFrame.m +++ b/GSWExtensions.framework/GSWIFrame.m @@ -1,8 +1,9 @@ /** GSWIFrame.m - GSWeb: Class GSWIFrame - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWIFrame.h" @@ -47,7 +50,7 @@ static char rcsId[] = "$Id$"; if ([self hasBinding:@"src"]) src=[self valueForBinding:@"src"]; else if ([self hasBinding:@"pageName"] || [self hasBinding:@"value"]) - src=[[self context]componentActionURL]; + src=(NSString*)[[self context]componentActionURL]; return src; }; diff --git a/GSWExtensions.framework/GSWLongResponsePage.m b/GSWExtensions.framework/GSWLongResponsePage.m index e4a78b4..cb39bf1 100644 --- a/GSWExtensions.framework/GSWLongResponsePage.m +++ b/GSWExtensions.framework/GSWLongResponsePage.m @@ -1,9 +1,9 @@ /** GSWLongResponsePage.m - GSWeb: Class GSWLongResponsePage - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2002-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Sep 2002 + Date: Sep 2002 $Revision$ $Date$ @@ -30,7 +30,9 @@ **/ -static const char rcsId[]="$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWLongResponsePage.h" diff --git a/GSWExtensions.framework/GSWMetaRefresh.m b/GSWExtensions.framework/GSWMetaRefresh.m index 62c38f2..0b01b3c 100644 --- a/GSWExtensions.framework/GSWMetaRefresh.m +++ b/GSWExtensions.framework/GSWMetaRefresh.m @@ -1,8 +1,9 @@ /** GSWMetaRefresh.m - GSWeb: Class GSWMetaRefresh - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWMetaRefresh.h" diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.m b/GSWExtensions.framework/GSWPageRestorationErrorPage.m index 8c5a9b0..916903a 100644 --- a/GSWExtensions.framework/GSWPageRestorationErrorPage.m +++ b/GSWExtensions.framework/GSWPageRestorationErrorPage.m @@ -1,8 +1,9 @@ /** GSWPageRestorationErrorPage.m - GSWeb: Class GSWPageRestorationErrorPage - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWPageRestorationErrorPage.h" diff --git a/GSWExtensions.framework/GSWRedirect.m b/GSWExtensions.framework/GSWRedirect.m index a25e07d..09d1506 100644 --- a/GSWExtensions.framework/GSWRedirect.m +++ b/GSWExtensions.framework/GSWRedirect.m @@ -1,8 +1,9 @@ /** GSWRedirect.m - GSWeb: Class GSWRedirect - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ <*license> **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWRedirect.h" diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.m b/GSWExtensions.framework/GSWSessionCreationErrorPage.m index d0b5749..3ef682f 100644 --- a/GSWExtensions.framework/GSWSessionCreationErrorPage.m +++ b/GSWExtensions.framework/GSWSessionCreationErrorPage.m @@ -1,8 +1,9 @@ /** GSWSessionCreationErrorPage.m - GSWeb: Class GSWSessionCreationErrorPage - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWSessionCreationErrorPage.h" diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m b/GSWExtensions.framework/GSWSessionRestorationErrorPage.m index 2ce9938..76d29cc 100644 --- a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m +++ b/GSWExtensions.framework/GSWSessionRestorationErrorPage.m @@ -1,8 +1,9 @@ /** GSWSessionRestorationErrorPage.m - GSWeb: Class GSWSessionRestorationErrorPage - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Jan 1999 + Date: Jan 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWSessionRestorationErrorPage.h" diff --git a/GSWExtensions.framework/GSWStatsPage.m b/GSWExtensions.framework/GSWStatsPage.m index 939a819..6a3ff11 100644 --- a/GSWExtensions.framework/GSWStatsPage.m +++ b/GSWExtensions.framework/GSWStatsPage.m @@ -1,8 +1,9 @@ /** GSWStatsPage.m - GSWeb: Class GSWStatsPage - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtWOCompatibility.h" #include "GSWStatsPage.h" diff --git a/GSWExtensions.framework/Makefile.preamble b/GSWExtensions.framework/Makefile.preamble index 1c38a75..1d80d15 100644 --- a/GSWExtensions.framework/Makefile.preamble +++ b/GSWExtensions.framework/Makefile.preamble @@ -1,8 +1,8 @@ # -*-makefile-*- -# Copyright (C) 1999-2002 Free Software Foundation, Inc. +# Copyright (C) 1999-2003 Free Software Foundation, Inc. # # Written by: Manuel Guesdon -# Date: Jan 1999 +# Date: Jan 1999 # # This file is part of the GNUstep Web Library. # @@ -59,7 +59,7 @@ endif ADDITIONAL_CFLAGS = # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I../.. -I../GSWeb.framework/derived_src +ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I.. -I../.. -I../GSWeb.framework/derived_src # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS = -lGSANTLR diff --git a/GSWExtensionsGSW.framework/GSWFileUploadComponent.m b/GSWExtensionsGSW.framework/GSWFileUploadComponent.m index 945b7dc..25b4c0e 100644 --- a/GSWExtensionsGSW.framework/GSWFileUploadComponent.m +++ b/GSWExtensionsGSW.framework/GSWFileUploadComponent.m @@ -1,9 +1,9 @@ /** GSWFileUploadComponent.m - GSWeb: Class GSWFileUploadComponent - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2002-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: May 2002 + Date: May 2002 $Revision$ $Date$ diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m b/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m index 99214aa..665c56a 100644 --- a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m +++ b/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m @@ -1,8 +1,9 @@ /** GSWFileUploadFormComponent.m - GSWeb: Class GSWFileUploadFormComponent - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Dec 1999 + Date: Dec 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtGSWWOCompatibility.h" #include "GSWFileUploadFormComponent.h" diff --git a/GSWExtensionsGSW.framework/GSWLogin.m b/GSWExtensionsGSW.framework/GSWLogin.m index 3c6e4a3..9141abd 100644 --- a/GSWExtensionsGSW.framework/GSWLogin.m +++ b/GSWExtensionsGSW.framework/GSWLogin.m @@ -1,11 +1,18 @@ -/* GSWLogin.m - GSWeb: Class GSWLogin - Copyright (C) 1999 Free Software Foundation, Inc. +/** GSWLogin.m - GSWeb: Class GSWLogin + + Copyright (C) 1999-2003 Free Software Foundation, Inc. - Written by: Manuel Guesdon - Date: Apr 1999 + Written by: Manuel Guesdon + Date: Apr 1999 + $Revision$ + $Date$ + + + This file is part of the GNUstep Web Library. - + + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either @@ -19,7 +26,13 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + +**/ + +#include "config.h" + +RCS_ID("$Id$") + #include "GSWExtGSWWOCompatibility.h" #include "GSWLogin.h" //==================================================================== diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m b/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m index 2eca724..bb13368 100644 --- a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m +++ b/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m @@ -1,8 +1,9 @@ /** GSWSimpleFormComponent.m - GSWeb: Class GSWSimpleFormComponent - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Sept 1999 + Date: Sept 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ */ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtGSWWOCompatibility.h" #include "GSWSimpleFormComponent.h" diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.m b/GSWExtensionsGSW.framework/GSWTabComponent.m index ddda5f8..09a6cc1 100644 --- a/GSWExtensionsGSW.framework/GSWTabComponent.m +++ b/GSWExtensionsGSW.framework/GSWTabComponent.m @@ -1,8 +1,9 @@ /** GSWTabComponent.m - GSWeb: Class GSWTabComponent - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Apr 1999 + Date: Apr 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtGSWWOCompatibility.h" #include "GSWTabComponent.h" diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m b/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m index 9c2c2a2..d427aad 100644 --- a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m +++ b/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m @@ -1,8 +1,9 @@ /** GSWValidationFailureComponent.m - GSWeb: Class GSWValidationFailureComponent - Copyright (C) 1999-2002 Free Software Foundation, Inc. + + Copyright (C) 1999-2003 Free Software Foundation, Inc. Written by: Manuel Guesdon - Date: Sept 1999 + Date: Sept 1999 $Revision$ $Date$ @@ -28,7 +29,9 @@ **/ -static char rcsId[] = "$Id$"; +#include "config.h" + +RCS_ID("$Id$") #include "GSWExtGSWWOCompatibility.h" #include "GSWValidationFailureComponent.h" diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m index 768a834..8c9963b 100644 --- a/GSWeb.framework/GSWApplication.m +++ b/GSWeb.framework/GSWApplication.m @@ -2800,6 +2800,7 @@ selfLockn, int iName=0; GSWComponent* page=nil; LOGObjectFnStart(); + NSLog(@"EXCEPTION: %@",anException); NSDebugMLLog(@"application",@"context=%@",context); if (context) [context _putAwakeComponentsToSleep]; @@ -2828,8 +2829,8 @@ selfLockn, { page=[self pageWithName:GSWExceptionPageName[GSWebNamingConvForRound(iName)] inContext:context]; - [page setIVarNamed:@"exception" - withValue:anException]; + [page takeValue:anException + forKey:@"exception"]; } NS_HANDLER { diff --git a/GSWeb.framework/GSWAssociation.m b/GSWeb.framework/GSWAssociation.m index db56284..340756a 100644 --- a/GSWeb.framework/GSWAssociation.m +++ b/GSWeb.framework/GSWAssociation.m @@ -740,7 +740,6 @@ static NSMutableArray* associationsLogsHandlerClasses=nil; for(i=0;!v && i0) { NSString* elementID=[context elementID]; BOOL appendToResponseElementIDIsFirst=NO; BOOL elementIDIsFirst=NO; BOOL OK=YES; -/* if ([elementID length]==0) - elementID=@"MARKER";*/ appendToResponseElementIDIsFirst=([_appendToResponseElementID length]==0 || [_appendToResponseElementID isEqualToString:@"0"]); elementIDIsFirst=([elementID length]==0 || [elementID isEqualToString:@"0"]); if (!appendToResponseElementIDIsFirst || appendToResponseElementIDIsFirst!=elementIDIsFirst) { OK=[_appendToResponseElementID isEqualToString:elementID]; - NSDebugMLog(@"[context elementID]=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d OK=%d [context isInLoop]=%d", - [context elementID],_appendToResponseElementID,[_appendToResponseElementID length],OK,[context isInLoop]); + NSDebugMLLog(@"GSWElement",@"[context elementID]=%@ _appendToResponseElementID=%@ [_appendToResponseElementID length]=%d OK=%d [context isInLoop]=%d", + [context elementID],_appendToResponseElementID,[_appendToResponseElementID length],OK,[context isInLoop]); }; if (!OK && ![context isInLoop]) { @@ -151,7 +137,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41; NSString* senderID=[context senderID]; if (start) [context addToDocStructureElement:self]; - NSDebugMLLog(@"gswdync",@"%s:.%d - %@ %s ELEMENT self=%p class=%@ defName=%@ id=%@ appendID:%@ %s%@", + NSDebugMLLog(@"GSWElement",@"%s:.%d - %@ %s ELEMENT self=%p class=%@ defName=%@ id=%@ appendID:%@ %s%@", file,line,NSStringFromSelector(method), (start ? "START" : (stop ? "STOP" : "")), self, diff --git a/GSWeb.framework/GSWRequest.m b/GSWeb.framework/GSWRequest.m index 2da704d..57e53b2 100644 --- a/GSWeb.framework/GSWRequest.m +++ b/GSWeb.framework/GSWRequest.m @@ -1374,12 +1374,13 @@ RCS_ID("$Id$") key,[value objectAtIndex:i]]; }; [headersString appendString:@"\n"]; - NSDebugMLLog(@"requests",@"headersString=%@",headersString); - NSDebugMLLog(@"requests",@"content=%@",[[[NSString alloc]initWithData:_content - encoding:NSISOLatin1StringEncoding]autorelease]); + NSDebugMLLog(@"requests",@"headersString=[\n%@\n]",headersString); + NSDebugMLLog(@"requests",@"content=[\n%@\n]",[[[NSString alloc]initWithData:_content + encoding:NSISOLatin1StringEncoding]autorelease]); headersData=[headersString dataUsingEncoding:NSISOLatin1StringEncoding]; parser=[GSMimeParser mimeParser]; [parser parse:headersData]; + [parser expectNoHeaders]; if ([parser parse:_content]) [parser parse:nil]; NSDebugMLLog(@"requests",@"[parser isComplete]=%d",[parser isComplete]); diff --git a/GSWeb.framework/GSWSession.m b/GSWeb.framework/GSWSession.m index c698254..3d8420f 100644 --- a/GSWeb.framework/GSWSession.m +++ b/GSWeb.framework/GSWSession.m @@ -641,6 +641,7 @@ RCS_ID("$Id$") [GSWApplication statusLogWithFormat:@"Deleting permanent cached Page"]; deleteContextID=[_permanentContextIDArray objectAtIndex:0]; GSWLogAssertGood(deleteContextID); + RETAIN(deleteContextID); // We'll remove it from array [GSWApplication statusLogWithFormat:@"permanentContextIDArray=%@", _permanentContextIDArray]; [GSWApplication statusLogWithFormat:@"contextID=%@",deleteContextID]; @@ -657,6 +658,7 @@ RCS_ID("$Id$") [deletePage class]]; NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[permanentPageCache objectForKey:deleteContextID]); [permanentPageCache removeObjectForKey:deleteContextID]; + RELEASE(deleteContextID); }; contextID=[context contextID]; NSAssert(contextID,@"No contextID"); @@ -917,7 +919,7 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self); //-------------------------------------------------------------------- -(void)_savePage:(GSWComponent*)page - forChange:(BOOL)forChange + forChange:(BOOL)forChange { //OK GSWResponse* response=nil; @@ -925,7 +927,9 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self); GSWTransactionRecord* transactionRecord=nil; unsigned int pageCacheSize=0; NSString* contextID=nil; + LOGObjectFnStart(); + NSAssert(page,@"No Page"); if ([_contextArrayStack count]>0) // && _forChange!=NO ?? [self _rearrangeContextArrayStack]; @@ -933,6 +937,7 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self); // Get the response response=[_currentContext response];//currentContext?? NSDebugMLLog(@"sessions",@"response=%@",response); + isClientCachingDisabled=[response _isClientCachingDisabled]; //So what NSDebugMLLog(@"sessions",@"currentContext=%@",_currentContext); @@ -950,8 +955,10 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self); // Create contextArrayStack and contextRecords if not already created if (!_contextArrayStack) _contextArrayStack=[NSMutableArray new]; + if (!_contextRecords) _contextRecords=[NSMutableDictionary new]; + NSDebugMLLog(@"sessions",@"contextArrayStack=%@",_contextArrayStack); NSDebugMLLog(@"sessions",@"contextRecords=%@",_contextRecords); @@ -960,25 +967,35 @@ fprintf(stderr,"session %p _releaseAutoreleasePool STOP\n",self); { id deleteRecord=nil; NSString* deleteContextID=nil; + [GSWApplication statusLogWithFormat:@"Deleting cached Page"]; + deleteContextID=[_contextArrayStack objectAtIndex:0]; GSWLogAssertGood(deleteContextID); + RETAIN(deleteContextID); // We'll remove it from array + [GSWApplication statusLogWithFormat:@"contextArrayStack=%@",_contextArrayStack]; [GSWApplication statusLogWithFormat:@"contextID=%@",deleteContextID]; + NSDebugMLLog(@"sessions",@"_deleteContextID=%@",deleteContextID); NSDebugMLLog(@"sessions",@"[contextArrayStack objectAtIndex:0]=%@", [_contextArrayStack objectAtIndex:0]); NSDebugMLLog(@"sessions",@"[contextArrayStack objectAtIndex:0] retainCount=%d", (int)[[_contextArrayStack objectAtIndex:0] retainCount]); NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[_contextArrayStack objectAtIndex:0]); + [_contextArrayStack removeObjectAtIndex:0]; deleteRecord=[_contextRecords objectForKey:deleteContextID]; + GSWLogAssertGood(deleteRecord); GSWLogAssertGood([deleteRecord responsePage]); [GSWApplication statusLogWithFormat:@"delete page of class=%@", [[deleteRecord responsePage] class]]; NSDebugMLLog(@"sessions",@"SESSION REMOVE: %p",[_contextRecords objectForKey:deleteContextID]); + [_contextRecords removeObjectForKey:deleteContextID]; + + RELEASE(deleteContextID); }; GSWLogC("display page"); diff --git a/GSWeb.framework/GSWeb.h b/GSWeb.framework/GSWeb.h index ccbd1d5..beb8630 100644 --- a/GSWeb.framework/GSWeb.h +++ b/GSWeb.framework/GSWeb.h @@ -133,7 +133,6 @@ #include "GSWDebug.h" #include "NSString+Trimming.h" #include "NSString+HTML.h" -#include "NSObject+IVarAccess+PerformSel.h" #include "GSWElementIDString.h" #include "GSWResponse.h" #include "GSWHTMLLexer.h"