From 1a2d2d3ece0f1a21da86552ac378c0839af6ae43 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 1 Oct 2008 20:20:37 +0000 Subject: [PATCH] Monotone-Parent: 2cdfb2dd04e8555d5ff253a496b2f0f37cee5b6a Monotone-Revision: 9939de1c955ffa36b273603dc43a2b4ac81d59aa Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-10-01T20:20:37 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-patchset-r1626.diff | 660 +++++++++++++++++----------------- 1 file changed, 330 insertions(+), 330 deletions(-) diff --git a/SOPE/sope-patchset-r1626.diff b/SOPE/sope-patchset-r1626.diff index 69b3d9065..5eb7dc7e7 100644 --- a/SOPE/sope-patchset-r1626.diff +++ b/SOPE/sope-patchset-r1626.diff @@ -1,7 +1,194 @@ +Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m +=================================================================== +--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1626) ++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail) +@@ -713,6 +713,39 @@ + return ms; + } + ++/* GCSEOAdaptorChannel protocol */ ++static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ ++ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" ++ @" c_content VARCHAR (100000) NOT NULL,\n" ++ @" c_creationdate INT4 NOT NULL,\n" ++ @" c_lastmodified INT4 NOT NULL,\n" ++ @" c_version INT4 NOT NULL,\n" ++ @" c_deleted INT4 NULL\n" ++ @")"); ++static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ ++ @" c_uid VARCHAR (256) NOT NULL,\n" ++ @" c_object VARCHAR (256) NOT NULL,\n" ++ @" c_role VARCHAR (80) NOT NULL\n" ++ @")"); ++ ++- (NSException *) createGCSFolderTableWithName: (NSString *) tableName ++{ ++ NSString *sql; ++ ++ sql = [NSString stringWithFormat: sqlFolderFormat, tableName]; ++ ++ return [self evaluateExpressionX: sql]; ++} ++ ++- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName ++{ ++ NSString *sql; ++ ++ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName]; ++ ++ return [self evaluateExpressionX: sql]; ++} ++ + @end /* PostgreSQL72Channel */ + + @implementation PostgreSQL72Channel(PrimaryKeyGeneration) +Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m +=================================================================== +--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1626) ++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail) +@@ -30,6 +30,7 @@ + + #import + ++static BOOL debugOn = NO; + // + // + // +@@ -41,10 +42,19 @@ + + @implementation OracleAdaptorChannel (Private) + +-- (void) _cleanup +++ (void) initialize + { ++ NSUserDefaults *ud; ++ ++ ud = [NSUserDefaults standardUserDefaults]; ++ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; ++} ++ ++- (void) _cleanup ++{ + column_info *info; + int c; ++ sword result; + + [_resultSetProperties removeAllObjects]; + +@@ -58,11 +68,29 @@ + // so we just free the value instead. + if (info->value) + { +- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS) ++ if (info->type == SQLT_CLOB ++ || info->type == SQLT_BLOB ++ || info->type == SQLT_BFILEE ++ || info->type == SQLT_CFILEE) ++ { ++ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB); ++ if (result != OCI_SUCCESS) ++ { ++ NSLog (@"value was not a LOB descriptor"); ++ abort(); ++ } ++ } ++ else + free(info->value); + info->value = NULL; + } +- free(info); ++ else ++ { ++ NSLog (@"trying to free an already freed value!"); ++ abort(); ++ } ++ free(info); ++ + [_row_buffer removeObjectAtIndex: c]; + } + +@@ -231,6 +259,9 @@ + + [self _cleanup]; + ++ if (debugOn) ++ [self logWithFormat: @"expression: %@", theExpression]; ++ + if (!theExpression || ![theExpression length]) + { + [NSException raise: @"OracleInvalidExpressionException" +@@ -302,7 +333,9 @@ + // We read the maximum width of a column + info->max_width = 0; + status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err); +- ++ ++ if (debugOn) ++ NSLog(@"name: %s, type: %d", cname, info->type); + attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; + [_resultSetProperties addObject: attribute]; + +@@ -609,7 +642,7 @@ + + /* GCSEOAdaptorChannel protocol */ + static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ +- @" c_name VARCHAR2 (256) NOT NULL,\n" ++ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n" + @" c_content CLOB NOT NULL,\n" + @" c_creationdate INTEGER NOT NULL,\n" + @" c_lastmodified INTEGER NOT NULL,\n" +Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m +=================================================================== +--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1626) ++++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail) +@@ -31,6 +31,8 @@ + #import + #import + ++static BOOL debugOn = NO; ++ + // + // + // +@@ -48,6 +50,14 @@ + // + @implementation OracleAdaptorChannelController + +++ (void) initialize ++{ ++ NSUserDefaults *ud; ++ ++ ud = [NSUserDefaults standardUserDefaults]; ++ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; ++} ++ + - (EODelegateResponse) adaptorChannel: (id) theChannel + willInsertRow: (NSMutableDictionary *) theRow + forEntity: (EOEntity *) theEntity +@@ -56,7 +66,8 @@ + NSArray *keys; + int i, c; + +- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); ++ if (debugOn) ++ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); + + s = AUTORELEASE([[NSMutableString alloc] init]); + +@@ -101,7 +112,8 @@ + NSArray *keys; + int i, c; + +- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]); ++ if (debugOn) ++ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]); + + s = AUTORELEASE([[NSMutableString alloc] init]); + Index: sope-mime/NGImap4/NGImap4Client.h =================================================================== ---- sope-mime/NGImap4/NGImap4Client.h (revision 1626) -+++ sope-mime/NGImap4/NGImap4Client.h (working copy) +--- sope-mime/NGImap4/NGImap4Client.h (révision 1626) ++++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) @@ -62,6 +62,8 @@ NGImap4ResponseNormalizer *normer; NSMutableArray *responseReceiver; @@ -30,8 +217,8 @@ Index: sope-mime/NGImap4/NGImap4Client.h - (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder; Index: sope-mime/NGImap4/NGImap4Client.m =================================================================== ---- sope-mime/NGImap4/NGImap4Client.m (revision 1626) -+++ sope-mime/NGImap4/NGImap4Client.m (working copy) +--- sope-mime/NGImap4/NGImap4Client.m (révision 1626) ++++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) @@ -24,6 +24,8 @@ #include "NGImap4Client.h" #include "NGImap4Context.h" @@ -133,24 +320,27 @@ Index: sope-mime/NGImap4/NGImap4Client.m return [self->normer normalizeResponse:map]; } -@@ -618,23 +632,24 @@ +@@ -617,24 +631,25 @@ + 'flags' - array of strings (eg (answered,flagged,draft,seen); 'RawResponse' - the raw IMAP4 response */ - NSString *s; +- NSString *s; - id tmp; - - tmp = self->selectedFolder; // remember ptr to old folder name - ++ NSString *s, *newFolder; + if (![_folder isNotEmpty]) return nil; if ((_folder = [self _folder2ImapFolder:_folder]) == nil) return nil; -+ [self->selectedFolder release]; - self->selectedFolder = [_folder copy]; +- self->selectedFolder = [_folder copy]; - - [tmp release]; tmp = nil; // release old folder name ++ newFolder = [NSString stringWithString: _folder]; ++ ASSIGN (self->selectedFolder, newFolder); s = [NSString stringWithFormat:@"select \"%@\"", self->selectedFolder]; return [self->normer normalizeSelectResponse:[self processCommand:s]]; @@ -333,8 +523,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m __PRETTY_FUNCTION__, [_exception name], [_exception reason]]; Index: sope-mime/NGImap4/NGSieveClient.m =================================================================== ---- sope-mime/NGImap4/NGSieveClient.m (revision 1626) -+++ sope-mime/NGImap4/NGSieveClient.m (working copy) +--- sope-mime/NGImap4/NGSieveClient.m (révision 1626) ++++ sope-mime/NGImap4/NGSieveClient.m (copie de travail) @@ -294,8 +294,8 @@ return con; } @@ -369,8 +559,8 @@ Index: sope-mime/NGImap4/NGSieveClient.m /* write */ Index: sope-mime/NGImap4/NGImap4Connection.h =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.h (revision 1626) -+++ sope-mime/NGImap4/NGImap4Connection.h (working copy) +--- sope-mime/NGImap4/NGImap4Connection.h (révision 1626) ++++ sope-mime/NGImap4/NGImap4Connection.h (copie de travail) @@ -89,6 +89,7 @@ - (NSArray *)subfoldersForURL:(NSURL *)_url; @@ -381,8 +571,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.m =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.m (revision 1626) -+++ sope-mime/NGImap4/NGImap4Connection.m (working copy) +--- sope-mime/NGImap4/NGImap4Connection.m (révision 1626) ++++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) @@ -381,7 +381,7 @@ if (debugCache) [self logWithFormat:@" no folders cached yet .."]; @@ -410,30 +600,27 @@ Index: sope-mime/NGImap4/NGImap4Connection.m id result; /* check in hierarchy cache */ -@@ -760,9 +760,16 @@ +@@ -760,11 +760,11 @@ // TODO: we should probably just fetch the whole hierarchy? folderName = [self imap4FolderNameForURL:_url]; - result = [[self client] select:folderName]; - if (![[result valueForKey:@"result"] boolValue]) - return NO; -+ previousFolderName = [[self client] selectedFolderName]; -+ if (![previousFolderName isEqualToString: folderName]) { -+ result = [[self client] select:folderName]; -+ if (previousFolderName) -+ [[self client] select:previousFolderName]; -+ else -+ [[self client] unselect]; -+ if (![[result valueForKey:@"result"] boolValue]) -+ return NO; -+ } - - return YES; +- +- return YES; ++ ++ result = [self->client status: folderName ++ flags: [NSArray arrayWithObject: @"UIDVALIDITY"]]; ++ ++ return ([[result valueForKey: @"result"] boolValue]); } + + - (id)infoForMailboxAtURL:(NSURL *)_url { Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1626) -+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) +--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1626) ++++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) @@ -292,7 +292,7 @@ /* filter for fetch response @@ -481,8 +668,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m if (objs) free(objs); Index: sope-mime/NGImap4/NGImap4ResponseParser.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1626) -+++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) +--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1626) ++++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) @@ -31,6 +31,7 @@ @interface NGImap4ResponseParser(ParsingPrivates) - (BOOL)_parseNumberUntaggedResponse:(NGMutableHashMap *)result_; @@ -956,8 +1143,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m self->serverResponseDebug = Index: sope-mime/NGImap4/ChangeLog =================================================================== ---- sope-mime/NGImap4/ChangeLog (revision 1626) -+++ sope-mime/NGImap4/ChangeLog (working copy) +--- sope-mime/NGImap4/ChangeLog (révision 1626) ++++ sope-mime/NGImap4/ChangeLog (copie de travail) @@ -1,3 +1,23 @@ +2008-09-22 Wolfgang Sourdeau + @@ -984,8 +1171,8 @@ Index: sope-mime/NGImap4/ChangeLog * NGImap4Connection.m: some fix for folders ending with a slash (OGo Index: sope-mime/NGImap4/NGImap4ConnectionManager.m =================================================================== ---- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1626) -+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) +--- sope-mime/NGImap4/NGImap4ConnectionManager.m (révision 1626) ++++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail) @@ -38,6 +38,9 @@ debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"]; @@ -1111,8 +1298,8 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m /* client object */ Index: sope-mime/NGImap4/NSString+Imap4.m =================================================================== ---- sope-mime/NGImap4/NSString+Imap4.m (revision 1626) -+++ sope-mime/NGImap4/NSString+Imap4.m (working copy) +--- sope-mime/NGImap4/NSString+Imap4.m (révision 1626) ++++ sope-mime/NGImap4/NSString+Imap4.m (copie de travail) @@ -20,11 +20,56 @@ 02111-1307, USA. */ @@ -1633,8 +1820,8 @@ Index: sope-mime/NGImap4/NSString+Imap4.m +@end /* NSString(Imap4) */ Index: sope-mime/NGMail/NGSmtpClient.m =================================================================== ---- sope-mime/NGMail/NGSmtpClient.m (revision 1626) -+++ sope-mime/NGMail/NGSmtpClient.m (working copy) +--- sope-mime/NGMail/NGSmtpClient.m (révision 1626) ++++ sope-mime/NGMail/NGSmtpClient.m (copie de travail) @@ -24,6 +24,82 @@ #include "NGSmtpReplyCodes.h" #include "common.h" @@ -1789,8 +1976,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m reply = [self receiveReply]; Index: sope-mime/NGMail/NGMailAddressParser.h =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.h (revision 1626) -+++ sope-mime/NGMail/NGMailAddressParser.h (working copy) +--- sope-mime/NGMail/NGMailAddressParser.h (révision 1626) ++++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) @@ -24,7 +24,9 @@ #import @@ -1827,8 +2014,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMimeMessageGenerator.m =================================================================== ---- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1626) -+++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) +--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1626) ++++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) @@ -86,37 +86,40 @@ char *des = NULL; unsigned int cnt; @@ -1893,8 +2080,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m unsigned isoEndLen = 2; Index: sope-mime/NGMail/NGMailAddressParser.m =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.m (revision 1626) -+++ sope-mime/NGMail/NGMailAddressParser.m (working copy) +--- sope-mime/NGMail/NGMailAddressParser.m (révision 1626) ++++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) @@ -52,9 +52,9 @@ StrClass = [NSString class]; } @@ -2038,8 +2225,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m self->dataPos = 0; Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m =================================================================== ---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1626) -+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) +--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1626) ++++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) @@ -19,88 +19,45 @@ 02111-1307, USA. */ @@ -2443,8 +2630,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m #if 0 Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1626) -+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) +--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (révision 1626) ++++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (copie de travail) @@ -428,6 +428,7 @@ NSString *boundary = nil; NSArray *rawBodyParts = nil; @@ -2468,8 +2655,8 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m if (rawBodyParts) { Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m =================================================================== ---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1626) -+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) +--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1626) ++++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) @@ -77,6 +77,7 @@ [rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:Fields->from]; @@ -2480,8 +2667,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeType.m =================================================================== ---- sope-mime/NGMime/NGMimeType.m (revision 1626) -+++ sope-mime/NGMime/NGMimeType.m (working copy) +--- sope-mime/NGMime/NGMimeType.m (révision 1626) ++++ sope-mime/NGMime/NGMimeType.m (copie de travail) @@ -120,28 +120,23 @@ /* some unsupported, but known encoding */ @@ -2578,8 +2765,8 @@ Index: sope-mime/NGMime/NGMimeType.m - (NSString *)stringValue { Index: sope-mime/NGMime/NGMimeBodyPart.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyPart.m (revision 1626) -+++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) +--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1626) ++++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) @@ -31,18 +31,6 @@ return 2; } @@ -2616,8 +2803,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m - (NSString *)contentId { Index: sope-mime/NGMime/ChangeLog =================================================================== ---- sope-mime/NGMime/ChangeLog (revision 1626) -+++ sope-mime/NGMime/ChangeLog (working copy) +--- sope-mime/NGMime/ChangeLog (révision 1626) ++++ sope-mime/NGMime/ChangeLog (copie de travail) @@ -1,3 +1,25 @@ +2008-09-08 Wolfgang Sourdeau + @@ -2646,8 +2833,8 @@ Index: sope-mime/NGMime/ChangeLog * fixes for OGo bug #789 (reply-to QP encoding) Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1626) -+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (révision 1626) ++++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (copie de travail) @@ -36,8 +36,7 @@ NGMimeType *type = nil; // only one content-type field NSString *tmp = nil; @@ -2786,8 +2973,8 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m } Index: sope-mime/NGMime/NGMimePartGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimePartGenerator.m (revision 1626) -+++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) +--- sope-mime/NGMime/NGMimePartGenerator.m (révision 1626) ++++ sope-mime/NGMime/NGMimePartGenerator.m (copie de travail) @@ -155,8 +155,9 @@ BOOL isMultiValue, isFirst; @@ -2811,8 +2998,8 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimeBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyParser.m (revision 1626) -+++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) +--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1626) ++++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) @@ -67,7 +67,10 @@ if (_data == nil) return nil; @@ -2827,8 +3014,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m Index: sope-mime/NGMime/NGMimePartParser.h =================================================================== ---- sope-mime/NGMime/NGMimePartParser.h (revision 1626) -+++ sope-mime/NGMime/NGMimePartParser.h (working copy) +--- sope-mime/NGMime/NGMimePartParser.h (révision 1626) ++++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) @@ -117,6 +117,7 @@ BOOL parserParseRawBodyDataOfPart:1; BOOL parserBodyParserForPart:1; @@ -2849,8 +3036,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h @interface NSObject(NGMimePartParser) Index: sope-mime/NGMime/NGMimePartParser.m =================================================================== ---- sope-mime/NGMime/NGMimePartParser.m (revision 1626) -+++ sope-mime/NGMime/NGMimePartParser.m (working copy) +--- sope-mime/NGMime/NGMimePartParser.m (révision 1626) ++++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) @@ -227,7 +227,7 @@ } @@ -2874,8 +3061,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m : [NGMimeType mimeType:[ctype stringValue]]; Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1626) -+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1626) ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) @@ -105,10 +105,10 @@ } @@ -2960,8 +3147,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m return data; Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1626) -+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1626) ++++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) @@ -49,80 +49,70 @@ // TODO: move the stuff below to some NSString or NSData category? @@ -3094,197 +3281,10 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m } return data; } -Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m -=================================================================== ---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1626) -+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) -@@ -713,6 +713,39 @@ - return ms; - } - -+/* GCSEOAdaptorChannel protocol */ -+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" -+ @" c_content VARCHAR (100000) NOT NULL,\n" -+ @" c_creationdate INT4 NOT NULL,\n" -+ @" c_lastmodified INT4 NOT NULL,\n" -+ @" c_version INT4 NOT NULL,\n" -+ @" c_deleted INT4 NULL\n" -+ @")"); -+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_uid VARCHAR (256) NOT NULL,\n" -+ @" c_object VARCHAR (256) NOT NULL,\n" -+ @" c_role VARCHAR (80) NOT NULL\n" -+ @")"); -+ -+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName -+{ -+ NSString *sql; -+ -+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName]; -+ -+ return [self evaluateExpressionX: sql]; -+} -+ -+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName -+{ -+ NSString *sql; -+ -+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName]; -+ -+ return [self evaluateExpressionX: sql]; -+} -+ - @end /* PostgreSQL72Channel */ - - @implementation PostgreSQL72Channel(PrimaryKeyGeneration) -Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m -=================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1626) -+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) -@@ -30,6 +30,7 @@ - - #import - -+static BOOL debugOn = NO; - // - // - // -@@ -41,10 +42,19 @@ - - @implementation OracleAdaptorChannel (Private) - --- (void) _cleanup -++ (void) initialize - { -+ NSUserDefaults *ud; -+ -+ ud = [NSUserDefaults standardUserDefaults]; -+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; -+} -+ -+- (void) _cleanup -+{ - column_info *info; - int c; -+ sword result; - - [_resultSetProperties removeAllObjects]; - -@@ -58,11 +68,29 @@ - // so we just free the value instead. - if (info->value) - { -- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS) -+ if (info->type == SQLT_CLOB -+ || info->type == SQLT_BLOB -+ || info->type == SQLT_BFILEE -+ || info->type == SQLT_CFILEE) -+ { -+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB); -+ if (result != OCI_SUCCESS) -+ { -+ NSLog (@"value was not a LOB descriptor"); -+ abort(); -+ } -+ } -+ else - free(info->value); - info->value = NULL; - } -- free(info); -+ else -+ { -+ NSLog (@"trying to free an already freed value!"); -+ abort(); -+ } -+ free(info); -+ - [_row_buffer removeObjectAtIndex: c]; - } - -@@ -231,6 +259,9 @@ - - [self _cleanup]; - -+ if (debugOn) -+ [self logWithFormat: @"expression: %@", theExpression]; -+ - if (!theExpression || ![theExpression length]) - { - [NSException raise: @"OracleInvalidExpressionException" -@@ -302,7 +333,9 @@ - // We read the maximum width of a column - info->max_width = 0; - status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err); -- -+ -+ if (debugOn) -+ NSLog(@"name: %s, type: %d", cname, info->type); - attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; - [_resultSetProperties addObject: attribute]; - -@@ -609,7 +642,7 @@ - - /* GCSEOAdaptorChannel protocol */ - static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -- @" c_name VARCHAR2 (256) NOT NULL,\n" -+ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n" - @" c_content CLOB NOT NULL,\n" - @" c_creationdate INTEGER NOT NULL,\n" - @" c_lastmodified INTEGER NOT NULL,\n" -Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m -=================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1626) -+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) -@@ -31,6 +31,8 @@ - #import - #import - -+static BOOL debugOn = NO; -+ - // - // - // -@@ -48,6 +50,14 @@ - // - @implementation OracleAdaptorChannelController - -++ (void) initialize -+{ -+ NSUserDefaults *ud; -+ -+ ud = [NSUserDefaults standardUserDefaults]; -+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"]; -+} -+ - - (EODelegateResponse) adaptorChannel: (id) theChannel - willInsertRow: (NSMutableDictionary *) theRow - forEntity: (EOEntity *) theEntity -@@ -56,7 +66,8 @@ - NSArray *keys; - int i, c; - -- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); -+ if (debugOn) -+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]); - - s = AUTORELEASE([[NSMutableString alloc] init]); - -@@ -101,7 +112,8 @@ - NSArray *keys; - int i, c; - -- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]); -+ if (debugOn) -+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]); - - s = AUTORELEASE([[NSMutableString alloc] init]); - Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1626) -+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) +--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1626) ++++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) @@ -30,6 +30,7 @@ @interface NSString(GSAdditions) @@ -3321,8 +3321,8 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h /* specific to libFoundation */ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1626) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1626) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) @@ -39,18 +39,6 @@ : (NSString *)[[self copy] autorelease]; } @@ -3410,8 +3410,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m - (BOOL)isAbsoluteURL Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1626) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1626) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) @@ -140,8 +140,12 @@ @@ -3453,8 +3453,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m =================================================================== ---- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1626) -+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy) +--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (révision 1626) ++++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (copie de travail) @@ -278,7 +278,12 @@ for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) { @@ -3471,8 +3471,8 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m ((c > 31) && (c < 61)) || Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1626) -+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) +--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1626) ++++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) @@ -19,6 +19,7 @@ 02111-1307, USA. */ @@ -3483,8 +3483,8 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (revision 1626) -+++ sope-core/NGStreams/GNUmakefile.preamble (working copy) +--- sope-core/NGStreams/GNUmakefile.preamble (révision 1626) ++++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) @@ -1,7 +1,10 @@ # compilation settings @@ -3498,8 +3498,8 @@ Index: sope-core/NGStreams/GNUmakefile.preamble -I.. Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) @@ -19,6 +19,8 @@ 02111-1307, USA. */ @@ -3520,8 +3520,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h id entityResolver; Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) @@ -30,6 +30,12 @@ #include #include @@ -3580,8 +3580,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m - (void)tearDownParser { Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1626) -+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy) +--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1626) ++++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail) @@ -614,7 +614,7 @@ xmlParseDocument(ctxt); @@ -3602,8 +3602,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m xmlFreeParserCtxt(self->ctxt); Index: sope-appserver/mod_ngobjweb/config.c =================================================================== ---- sope-appserver/mod_ngobjweb/config.c (revision 1626) -+++ sope-appserver/mod_ngobjweb/config.c (working copy) +--- sope-appserver/mod_ngobjweb/config.c (révision 1626) ++++ sope-appserver/mod_ngobjweb/config.c (copie de travail) @@ -21,7 +21,7 @@ #include "common.h" @@ -3613,22 +3613,10 @@ Index: sope-appserver/mod_ngobjweb/config.c static char *_makeString(char *buf, char *str, int max) { if (buf == NULL) -Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c -=================================================================== ---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1626) -+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy) -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include "common.h" - #include "NGBufferedDescriptor.h" - - // returns the number of bytes which where read from the buffer Index: sope-appserver/mod_ngobjweb/GNUmakefile =================================================================== ---- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1626) -+++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) +--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1626) ++++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) @@ -82,7 +82,7 @@ CFLAGS = -Wall -I. -fPIC \ @@ -3648,10 +3636,22 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile install-usr-libexec :: all $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ +Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c +=================================================================== +--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1626) ++++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail) +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include "common.h" + #include "NGBufferedDescriptor.h" + + // returns the number of bytes which where read from the buffer Index: sope-appserver/NGObjWeb/GNUmakefile.postamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1626) -+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) +--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1626) ++++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) @@ -23,14 +23,20 @@ # install makefiles @@ -3682,8 +3682,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make Index: sope-appserver/NGObjWeb/WOContext.m =================================================================== ---- sope-appserver/NGObjWeb/WOContext.m (revision 1626) -+++ sope-appserver/NGObjWeb/WOContext.m (working copy) +--- sope-appserver/NGObjWeb/WOContext.m (révision 1626) ++++ sope-appserver/NGObjWeb/WOContext.m (copie de travail) @@ -64,11 +64,13 @@ static BOOL testNSURLs = NO; static BOOL newCURLStyle = NO; @@ -3722,8 +3722,8 @@ Index: sope-appserver/NGObjWeb/WOContext.m serverURL = [@"http://" stringByAppendingString:host]; Index: sope-appserver/NGObjWeb/ChangeLog =================================================================== ---- sope-appserver/NGObjWeb/ChangeLog (revision 1626) -+++ sope-appserver/NGObjWeb/ChangeLog (working copy) +--- sope-appserver/NGObjWeb/ChangeLog (révision 1626) ++++ sope-appserver/NGObjWeb/ChangeLog (copie de travail) @@ -1,3 +1,8 @@ +2008-09-01 Ludovic Marcotte + @@ -3735,8 +3735,8 @@ Index: sope-appserver/NGObjWeb/ChangeLog * WOHTTPURLHandle.m: add 'query' component of URL to request path Index: sope-appserver/NGObjWeb/DAVPropMap.plist =================================================================== ---- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1626) -+++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) +--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1626) ++++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) @@ -24,13 +24,19 @@ "{DAV:}status" = "davStatus"; "{http://apache.org/dav/props/}executable" = "davIsExecutable"; @@ -3813,8 +3813,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{http://groupdav.org/}component-set" = gdavComponentSet; Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail) @@ -655,6 +655,7 @@ if (self->responses == nil) self->responses = [[NSMutableArray alloc] initWithCapacity:64]; @@ -3825,8 +3825,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m case 'n': Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail) @@ -1523,16 +1523,16 @@ - (id)doREPORT:(WOContext *)_ctx { id domDocument; @@ -3913,8 +3913,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m /* DAV access control lists */ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) @@ -277,7 +277,8 @@ ok = [self renderLockToken:_object inContext:_ctx]; break; @@ -3927,8 +3927,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m ok = [self renderStatusResult:_object Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1626) -+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (révision 1626) ++++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail) @@ -62,6 +62,7 @@ properties:(NSDictionary *)_props inContext:(id)_ctx; @@ -3939,8 +3939,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h inContext:(id)_ctx; Index: sope-appserver/NGObjWeb/WODirectAction.m =================================================================== ---- sope-appserver/NGObjWeb/WODirectAction.m (revision 1626) -+++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) +--- sope-appserver/NGObjWeb/WODirectAction.m (révision 1626) ++++ sope-appserver/NGObjWeb/WODirectAction.m (copie de travail) @@ -46,7 +46,7 @@ } - (id)initWithContext:(WOContext *)_ctx { @@ -3974,8 +3974,8 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) @@ -216,6 +216,12 @@ assocCount++; } @@ -3991,8 +3991,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) @@ -41,6 +41,7 @@ WOAssociation *string; WOAssociation *target; @@ -4024,8 +4024,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m return NO; Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1626) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1626) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) @@ -41,7 +41,8 @@ WOAssociation *pageName; WOAssociation *actionClass; @@ -4038,8 +4038,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h /* 'ivar' associations */ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1626) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) +--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1626) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) @@ -39,22 +39,34 @@ static int debugLookup = -1; static int debugBaseURL = -1; @@ -4189,8 +4189,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1626) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy) +--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (révision 1626) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail) @@ -195,7 +195,8 @@ isCreateIfMissingMethod = YES; else if ([m isEqualToString:@"PROPPATCH"]) @@ -4203,8 +4203,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m // TODO: the following are only create-if-missing on the target! Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1626) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1626) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) @@ -32,6 +32,7 @@ #include #include @@ -4228,8 +4228,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m @implementation WOCoreApplication(SimpleParserSelection) Index: sope-appserver/NGObjWeb/Defaults.plist =================================================================== ---- sope-appserver/NGObjWeb/Defaults.plist (revision 1626) -+++ sope-appserver/NGObjWeb/Defaults.plist (working copy) +--- sope-appserver/NGObjWeb/Defaults.plist (révision 1626) ++++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail) @@ -216,7 +216,7 @@ SoWebDAVDisableCrossHostMoveCheck = NO; @@ -4249,8 +4249,8 @@ Index: sope-appserver/NGObjWeb/Defaults.plist DELETE, Index: sope-appserver/NGObjWeb/WORequest.m =================================================================== ---- sope-appserver/NGObjWeb/WORequest.m (revision 1626) -+++ sope-appserver/NGObjWeb/WORequest.m (working copy) +--- sope-appserver/NGObjWeb/WORequest.m (révision 1626) ++++ sope-appserver/NGObjWeb/WORequest.m (copie de travail) @@ -597,6 +597,8 @@ if (r.length > 0) language = [language substringToIndex:r.location]; @@ -4262,8 +4262,8 @@ Index: sope-appserver/NGObjWeb/WORequest.m if ((tmp = [self languageForBrowserLanguageCode:language])) Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1626) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1626) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail) @@ -62,6 +62,10 @@ /* RFC 3253 (DeltaV) */ NGHttpMethod_REPORT, @@ -4277,8 +4277,8 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1626) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1626) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail) @@ -59,6 +59,10 @@ /* RFC 3253 (DeltaV) */ @"REPORT",