LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: 0bc570e01ac30760257738a29e0d780e964f4a8a
Monotone-Revision: 28c05bb78bef144b921bd396d723df3160a6cd68

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-03-09T16:40:38
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2009-03-09 16:40:38 +00:00
parent 3fc8b43b44
commit 208d480790
2 changed files with 178 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* Documentation/SOGo Installation Guide.odt * Documentation/SOGo Installation Guide.odt
Added two examples for default ACL. Added two examples for default ACL.
* Updated the SOPE patchset
2009-03-08 Ludovic Marcotte <lmarcotte@inverse.ca> 2009-03-08 Ludovic Marcotte <lmarcotte@inverse.ca>

261
SOPE/sope-patchset-r1630.diff
View File

@ -1,6 +1,6 @@
Index: sope-mime/NGImap4/NGImap4Client.h Index: sope-mime/NGImap4/NGImap4Client.h
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Client.h (revision 1630) --- sope-mime/NGImap4/NGImap4Client.h (revision 1632)
+++ sope-mime/NGImap4/NGImap4Client.h (working copy) +++ sope-mime/NGImap4/NGImap4Client.h (working copy)
@@ -62,6 +62,8 @@ @@ -62,6 +62,8 @@
NGImap4ResponseNormalizer *normer; NGImap4ResponseNormalizer *normer;
@ -30,7 +30,7 @@ Index: sope-mime/NGImap4/NGImap4Client.h
- (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder; - (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder;
Index: sope-mime/NGImap4/NGImap4Client.m Index: sope-mime/NGImap4/NGImap4Client.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Client.m (revision 1630) --- sope-mime/NGImap4/NGImap4Client.m (revision 1632)
+++ sope-mime/NGImap4/NGImap4Client.m (working copy) +++ sope-mime/NGImap4/NGImap4Client.m (working copy)
@@ -24,6 +24,8 @@ @@ -24,6 +24,8 @@
#include "NGImap4Client.h" #include "NGImap4Client.h"
@ -339,7 +339,7 @@ Index: sope-mime/NGImap4/NGImap4Client.m
__PRETTY_FUNCTION__, [_exception name], [_exception reason]]; __PRETTY_FUNCTION__, [_exception name], [_exception reason]];
Index: sope-mime/NGImap4/NGSieveClient.m Index: sope-mime/NGImap4/NGSieveClient.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGSieveClient.m (revision 1630) --- sope-mime/NGImap4/NGSieveClient.m (revision 1632)
+++ sope-mime/NGImap4/NGSieveClient.m (working copy) +++ sope-mime/NGImap4/NGSieveClient.m (working copy)
@@ -294,8 +294,8 @@ @@ -294,8 +294,8 @@
return con; return con;
@ -375,7 +375,7 @@ Index: sope-mime/NGImap4/NGSieveClient.m
/* write */ /* write */
Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.h
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Connection.h (revision 1630) --- sope-mime/NGImap4/NGImap4Connection.h (revision 1632)
+++ sope-mime/NGImap4/NGImap4Connection.h (working copy) +++ sope-mime/NGImap4/NGImap4Connection.h (working copy)
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@
@ -387,7 +387,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.h
Index: sope-mime/NGImap4/NGImap4Connection.m Index: sope-mime/NGImap4/NGImap4Connection.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4Connection.m (revision 1630) --- sope-mime/NGImap4/NGImap4Connection.m (revision 1632)
+++ sope-mime/NGImap4/NGImap4Connection.m (working copy) +++ sope-mime/NGImap4/NGImap4Connection.m (working copy)
@@ -381,7 +381,7 @@ @@ -381,7 +381,7 @@
@ -435,7 +435,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
- (id)infoForMailboxAtURL:(NSURL *)_url { - (id)infoForMailboxAtURL:(NSURL *)_url {
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1630) --- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1632)
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) +++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy)
@@ -292,7 +292,7 @@ @@ -292,7 +292,7 @@
/* /*
@ -484,7 +484,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
if (objs) free(objs); if (objs) free(objs);
Index: sope-mime/NGImap4/NGImap4ResponseParser.m Index: sope-mime/NGImap4/NGImap4ResponseParser.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1630) --- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1632)
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) +++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy)
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@interface NGImap4ResponseParser(ParsingPrivates) @interface NGImap4ResponseParser(ParsingPrivates)
@ -935,7 +935,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
self->serverResponseDebug = self->serverResponseDebug =
Index: sope-mime/NGImap4/ChangeLog Index: sope-mime/NGImap4/ChangeLog
=================================================================== ===================================================================
--- sope-mime/NGImap4/ChangeLog (revision 1630) --- sope-mime/NGImap4/ChangeLog (revision 1632)
+++ sope-mime/NGImap4/ChangeLog (working copy) +++ sope-mime/NGImap4/ChangeLog (working copy)
@@ -1,3 +1,29 @@ @@ -1,3 +1,29 @@
+2008-10-23 Wolfgang Sourdeau <wsourdeau@inverse.ca> +2008-10-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
@ -969,7 +969,7 @@ Index: sope-mime/NGImap4/ChangeLog
* NGImap4Connection.m: some fix for folders ending with a slash (OGo * NGImap4Connection.m: some fix for folders ending with a slash (OGo
Index: sope-mime/NGImap4/NGImap4ConnectionManager.m Index: sope-mime/NGImap4/NGImap4ConnectionManager.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1630) --- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1632)
+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) +++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy)
@@ -38,6 +38,9 @@ @@ -38,6 +38,9 @@
debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"];
@ -1096,7 +1096,7 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m
/* client object */ /* client object */
Index: sope-mime/NGImap4/NSString+Imap4.m Index: sope-mime/NGImap4/NSString+Imap4.m
=================================================================== ===================================================================
--- sope-mime/NGImap4/NSString+Imap4.m (revision 1630) --- sope-mime/NGImap4/NSString+Imap4.m (revision 1632)
+++ sope-mime/NGImap4/NSString+Imap4.m (working copy) +++ sope-mime/NGImap4/NSString+Imap4.m (working copy)
@@ -20,11 +20,56 @@ @@ -20,11 +20,56 @@
02111-1307, USA. 02111-1307, USA.
@ -1618,7 +1618,7 @@ Index: sope-mime/NGImap4/NSString+Imap4.m
+@end /* NSString(Imap4) */ +@end /* NSString(Imap4) */
Index: sope-mime/NGMail/NGSmtpClient.m Index: sope-mime/NGMail/NGSmtpClient.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGSmtpClient.m (revision 1630) --- sope-mime/NGMail/NGSmtpClient.m (revision 1632)
+++ sope-mime/NGMail/NGSmtpClient.m (working copy) +++ sope-mime/NGMail/NGSmtpClient.m (working copy)
@@ -24,6 +24,82 @@ @@ -24,6 +24,82 @@
#include "NGSmtpReplyCodes.h" #include "NGSmtpReplyCodes.h"
@ -1774,7 +1774,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
reply = [self receiveReply]; reply = [self receiveReply];
Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMailAddressParser.h
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMailAddressParser.h (revision 1630) --- sope-mime/NGMail/NGMailAddressParser.h (revision 1632)
+++ sope-mime/NGMail/NGMailAddressParser.h (working copy) +++ sope-mime/NGMail/NGMailAddressParser.h (working copy)
@@ -24,7 +24,9 @@ @@ -24,7 +24,9 @@
@ -1812,7 +1812,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.h
Index: sope-mime/NGMail/NGMimeMessageGenerator.m Index: sope-mime/NGMail/NGMimeMessageGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1630) --- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1632)
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) +++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy)
@@ -86,37 +86,40 @@ @@ -86,37 +86,40 @@
char *des = NULL; char *des = NULL;
@ -1878,7 +1878,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
unsigned isoEndLen = 2; unsigned isoEndLen = 2;
Index: sope-mime/NGMail/NGMailAddressParser.m Index: sope-mime/NGMail/NGMailAddressParser.m
=================================================================== ===================================================================
--- sope-mime/NGMail/NGMailAddressParser.m (revision 1630) --- sope-mime/NGMail/NGMailAddressParser.m (revision 1632)
+++ sope-mime/NGMail/NGMailAddressParser.m (working copy) +++ sope-mime/NGMail/NGMailAddressParser.m (working copy)
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
StrClass = [NSString class]; StrClass = [NSString class];
@ -2023,7 +2023,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.m
self->dataPos = 0; self->dataPos = 0;
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1630) --- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1632)
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) +++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy)
@@ -19,88 +19,45 @@ @@ -19,88 +19,45 @@
02111-1307, USA. 02111-1307, USA.
@ -2428,7 +2428,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
#if 0 #if 0
Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1630) --- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1632)
+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) +++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy)
@@ -428,6 +428,7 @@ @@ -428,6 +428,7 @@
NSString *boundary = nil; NSString *boundary = nil;
@ -2453,7 +2453,7 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m
if (rawBodyParts) { if (rawBodyParts) {
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1630) --- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1632)
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) +++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy)
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
[rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:@"bcc"];
@ -2465,7 +2465,7 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
Index: sope-mime/NGMime/NGMimeType.m Index: sope-mime/NGMime/NGMimeType.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeType.m (revision 1630) --- sope-mime/NGMime/NGMimeType.m (revision 1632)
+++ sope-mime/NGMime/NGMimeType.m (working copy) +++ sope-mime/NGMime/NGMimeType.m (working copy)
@@ -120,28 +120,23 @@ @@ -120,28 +120,23 @@
@ -2563,7 +2563,7 @@ Index: sope-mime/NGMime/NGMimeType.m
- (NSString *)stringValue { - (NSString *)stringValue {
Index: sope-mime/NGMime/NGMimeBodyPart.m Index: sope-mime/NGMime/NGMimeBodyPart.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeBodyPart.m (revision 1630) --- sope-mime/NGMime/NGMimeBodyPart.m (revision 1632)
+++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) +++ sope-mime/NGMime/NGMimeBodyPart.m (working copy)
@@ -31,18 +31,6 @@ @@ -31,18 +31,6 @@
return 2; return 2;
@ -2601,7 +2601,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
- (NSString *)contentId { - (NSString *)contentId {
Index: sope-mime/NGMime/ChangeLog Index: sope-mime/NGMime/ChangeLog
=================================================================== ===================================================================
--- sope-mime/NGMime/ChangeLog (revision 1630) --- sope-mime/NGMime/ChangeLog (revision 1632)
+++ sope-mime/NGMime/ChangeLog (working copy) +++ sope-mime/NGMime/ChangeLog (working copy)
@@ -1,3 +1,25 @@ @@ -1,3 +1,25 @@
+2008-09-08 Wolfgang Sourdeau <wsourdeau@inverse.ca> +2008-09-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
@ -2631,7 +2631,7 @@ Index: sope-mime/NGMime/ChangeLog
* fixes for OGo bug #789 (reply-to QP encoding) * fixes for OGo bug #789 (reply-to QP encoding)
Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1630) --- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1632)
+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) +++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy)
@@ -36,8 +36,7 @@ @@ -36,8 +36,7 @@
NGMimeType *type = nil; // only one content-type field NGMimeType *type = nil; // only one content-type field
@ -2771,7 +2771,7 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m
} }
Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimePartGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimePartGenerator.m (revision 1630) --- sope-mime/NGMime/NGMimePartGenerator.m (revision 1632)
+++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) +++ sope-mime/NGMime/NGMimePartGenerator.m (working copy)
@@ -155,8 +155,9 @@ @@ -155,8 +155,9 @@
BOOL isMultiValue, isFirst; BOOL isMultiValue, isFirst;
@ -2796,7 +2796,7 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m
Index: sope-mime/NGMime/NGMimeBodyParser.m Index: sope-mime/NGMime/NGMimeBodyParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeBodyParser.m (revision 1630) --- sope-mime/NGMime/NGMimeBodyParser.m (revision 1632)
+++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) +++ sope-mime/NGMime/NGMimeBodyParser.m (working copy)
@@ -67,7 +67,10 @@ @@ -67,7 +67,10 @@
if (_data == nil) return nil; if (_data == nil) return nil;
@ -2812,7 +2812,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
Index: sope-mime/NGMime/NGMimePartParser.h Index: sope-mime/NGMime/NGMimePartParser.h
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimePartParser.h (revision 1630) --- sope-mime/NGMime/NGMimePartParser.h (revision 1632)
+++ sope-mime/NGMime/NGMimePartParser.h (working copy) +++ sope-mime/NGMime/NGMimePartParser.h (working copy)
@@ -117,6 +117,7 @@ @@ -117,6 +117,7 @@
BOOL parserParseRawBodyDataOfPart:1; BOOL parserParseRawBodyDataOfPart:1;
@ -2834,7 +2834,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
@interface NSObject(NGMimePartParser) @interface NSObject(NGMimePartParser)
Index: sope-mime/NGMime/NGMimePartParser.m Index: sope-mime/NGMime/NGMimePartParser.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimePartParser.m (revision 1630) --- sope-mime/NGMime/NGMimePartParser.m (revision 1632)
+++ sope-mime/NGMime/NGMimePartParser.m (working copy) +++ sope-mime/NGMime/NGMimePartParser.m (working copy)
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
} }
@ -2859,7 +2859,7 @@ Index: sope-mime/NGMime/NGMimePartParser.m
: [NGMimeType mimeType:[ctype stringValue]]; : [NGMimeType mimeType:[ctype stringValue]];
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1630) --- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1632)
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) +++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy)
@@ -105,10 +105,10 @@ @@ -105,10 +105,10 @@
} }
@ -2945,7 +2945,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
return data; return data;
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
=================================================================== ===================================================================
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1630) --- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1632)
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) +++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy)
@@ -49,80 +49,70 @@ @@ -49,80 +49,70 @@
@ -3081,7 +3081,7 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
} }
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
=================================================================== ===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1630) --- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1632)
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) +++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy)
@@ -713,6 +713,39 @@ @@ -713,6 +713,39 @@
return ms; return ms;
@ -3125,8 +3125,17 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
@implementation PostgreSQL72Channel(PrimaryKeyGeneration) @implementation PostgreSQL72Channel(PrimaryKeyGeneration)
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
=================================================================== ===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1630) --- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1632)
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) +++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy)
@@ -1,7 +1,7 @@
/*
** OracleAdaptorChannel.m
**
-** Copyright (c) 2007 Inverse groupe conseil inc. and Ludovic Marcotte
+** Copyright (c) 2007-2009 Inverse inc. and Ludovic Marcotte
**
** Author: Ludovic Marcotte <ludovic@inverse.ca>
**
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
@ -3135,28 +3144,20 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
// //
// //
// //
@@ -41,10 +42,19 @@ @@ -41,10 +42,11 @@
@implementation OracleAdaptorChannel (Private) @implementation OracleAdaptorChannel (Private)
-- (void) _cleanup -- (void) _cleanup
++ (void) initialize
{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+}
+
+- (void) _cleanup +- (void) _cleanup
+{ {
column_info *info; column_info *info;
int c; int c;
+ sword result; + sword result;
[_resultSetProperties removeAllObjects]; [_resultSetProperties removeAllObjects];
@@ -58,11 +68,29 @@ @@ -58,11 +60,29 @@
// so we just free the value instead. // so we just free the value instead.
if (info->value) if (info->value)
{ {
@ -3188,6 +3189,59 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
[_row_buffer removeObjectAtIndex: c]; [_row_buffer removeObjectAtIndex: c];
} }
@@ -78,8 +98,7 @@
//
@implementation OracleAdaptorChannel
-static void
-DBTerminate()
+static void DBTerminate()
{
if (OCITerminate(OCI_DEFAULT))
NSLog(@"FAILED: OCITerminate()");
@@ -89,6 +108,11 @@
+ (void) initialize
{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+
// We Initialize the OCI process environment.
if (OCIInitialize((ub4)OCI_DEFAULT, (dvoid *)0,
(dvoid * (*)(dvoid *, size_t)) 0,
@@ -156,14 +180,17 @@
[super closeChannel];
// We logoff from the database.
- if (OCILogoff(_oci_ctx, _oci_err))
+ if (!_oci_ctx || !_oci_err || OCILogoff(_oci_ctx, _oci_err))
{
NSLog(@"FAILED: OCILogoff()");
}
+ if (_oci_ctx)
+ OCIHandleFree(_oci_ctx, OCI_HTYPE_SVCCTX);
- OCIHandleFree(_oci_ctx, OCI_HTYPE_SVCCTX);
- OCIHandleFree(_oci_err, OCI_HTYPE_ERROR);
+ if (_oci_err)
+ OCIHandleFree(_oci_err, OCI_HTYPE_ERROR);
+
// OCIHandleFree(_oci_env, OCI_HTYPE_ENV);
_oci_ctx = (OCISvcCtx *)0;
@@ -177,7 +204,8 @@
//
- (void) dealloc
{
- //NSLog(@"OracleAdaptorChannel: -dealloc");
+ if (debugOn)
+ NSLog(@"OracleAdaptorChannel: -dealloc");
[self _cleanup];
@@ -231,6 +259,9 @@ @@ -231,6 +259,9 @@
[self _cleanup]; [self _cleanup];
@ -3209,7 +3263,46 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width]; attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width];
[_resultSetProperties addObject: attribute]; [_resultSetProperties addObject: attribute];
@@ -609,7 +642,7 @@ @@ -394,16 +427,17 @@
return NO;
}
-
if (OCIEnvInit((OCIEnv **)&_oci_env, (ub4)OCI_DEFAULT, (size_t)0, (dvoid **)0))
{
NSLog(@"FAILED: OCIEnvInit()");
+ [self closeChannel];
return NO;
}
if (OCIHandleAlloc((dvoid *)_oci_env, (dvoid *)&_oci_err, (ub4)OCI_HTYPE_ERROR, (size_t)0, (dvoid **)0))
{
NSLog(@"FAILED: OCIHandleAlloc() on errhp");
+ [self closeChannel];
return NO;
}
@@ -422,6 +456,7 @@
{
NSLog(@"FAILED: OCILogon(). username = %s password = %s"
@" database = %s", username, password, database);
+ [self closeChannel];
return NO;
}
@@ -438,6 +473,11 @@
{
sword status;
+ // We check if our connection is open prior to trying to fetch any data. OCIStmtFetch2() returns
+ // NO error code if the OCI environment is set up but the OCILogon() has failed.
+ if (![self isOpen])
+ return nil;
+
status = OCIStmtFetch2(_current_stm, _oci_err, (ub4)1, (ub4)OCI_FETCH_NEXT, (sb4)0, (ub4)OCI_DEFAULT);
if (status == OCI_NO_DATA)
@@ -609,7 +649,7 @@
/* GCSEOAdaptorChannel protocol */ /* GCSEOAdaptorChannel protocol */
static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
@ -3220,7 +3313,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
@" c_lastmodified INTEGER NOT NULL,\n" @" c_lastmodified INTEGER NOT NULL,\n"
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
=================================================================== ===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1630) --- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1632)
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) +++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy)
@@ -31,6 +31,8 @@ @@ -31,6 +31,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@ -3268,7 +3361,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
=================================================================== ===================================================================
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1630) --- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1632)
+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) +++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy)
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
@ -3306,7 +3399,7 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
/* specific to libFoundation */ /* specific to libFoundation */
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1630) --- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1632)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) +++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy)
@@ -39,18 +39,6 @@ @@ -39,18 +39,6 @@
: (NSString *)[[self copy] autorelease]; : (NSString *)[[self copy] autorelease];
@ -3395,7 +3488,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m
- (BOOL)isAbsoluteURL - (BOOL)isAbsoluteURL
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1630) --- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1632)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) +++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy)
@@ -140,8 +140,12 @@ @@ -140,8 +140,12 @@
@ -3438,7 +3531,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1630) --- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1632)
+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy) +++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy)
@@ -278,7 +278,12 @@ @@ -278,7 +278,12 @@
@ -3456,7 +3549,7 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m
((c > 31) && (c < 61)) || ((c > 31) && (c < 61)) ||
Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
=================================================================== ===================================================================
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1630) --- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1632)
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) +++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy)
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
02111-1307, USA. 02111-1307, USA.
@ -3468,7 +3561,7 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
Index: sope-core/NGStreams/GNUmakefile.preamble Index: sope-core/NGStreams/GNUmakefile.preamble
=================================================================== ===================================================================
--- sope-core/NGStreams/GNUmakefile.preamble (revision 1630) --- sope-core/NGStreams/GNUmakefile.preamble (revision 1632)
+++ sope-core/NGStreams/GNUmakefile.preamble (working copy) +++ sope-core/NGStreams/GNUmakefile.preamble (working copy)
@@ -1,7 +1,10 @@ @@ -1,7 +1,10 @@
# compilation settings # compilation settings
@ -3483,7 +3576,7 @@ Index: sope-core/NGStreams/GNUmakefile.preamble
-I.. -I..
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1630) --- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1632)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy)
@@ -19,6 +19,8 @@ @@ -19,6 +19,8 @@
02111-1307, USA. 02111-1307, USA.
@ -3505,7 +3598,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
id<NSObject,SaxEntityResolver> entityResolver; id<NSObject,SaxEntityResolver> entityResolver;
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1630) --- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1632)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy)
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
#include <libxml/HTMLparser.h> #include <libxml/HTMLparser.h>
@ -3565,7 +3658,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
- (void)tearDownParser { - (void)tearDownParser {
Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
=================================================================== ===================================================================
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1630) --- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1632)
+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy) +++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy)
@@ -614,7 +614,7 @@ @@ -614,7 +614,7 @@
xmlParseDocument(ctxt); xmlParseDocument(ctxt);
@ -3587,7 +3680,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
xmlFreeParserCtxt(self->ctxt); xmlFreeParserCtxt(self->ctxt);
Index: sope-appserver/mod_ngobjweb/config.c Index: sope-appserver/mod_ngobjweb/config.c
=================================================================== ===================================================================
--- sope-appserver/mod_ngobjweb/config.c (revision 1630) --- sope-appserver/mod_ngobjweb/config.c (revision 1632)
+++ sope-appserver/mod_ngobjweb/config.c (working copy) +++ sope-appserver/mod_ngobjweb/config.c (working copy)
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
@ -3598,9 +3691,21 @@ Index: sope-appserver/mod_ngobjweb/config.c
static char *_makeString(char *buf, char *str, int max) { static char *_makeString(char *buf, char *str, int max) {
if (buf == NULL) if (buf == NULL)
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1632)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy)
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include "common.h"
#include "NGBufferedDescriptor.h"
// returns the number of bytes which where read from the buffer
Index: sope-appserver/mod_ngobjweb/GNUmakefile Index: sope-appserver/mod_ngobjweb/GNUmakefile
=================================================================== ===================================================================
--- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1630) --- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1632)
+++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) +++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy)
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
@ -3621,21 +3726,9 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
install-usr-libexec :: all install-usr-libexec :: all
$(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1630)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy)
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include "common.h"
#include "NGBufferedDescriptor.h"
// returns the number of bytes which where read from the buffer
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1630) --- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1632)
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) +++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy)
@@ -23,14 +23,20 @@ @@ -23,14 +23,20 @@
@ -3667,7 +3760,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
Index: sope-appserver/NGObjWeb/WOContext.m Index: sope-appserver/NGObjWeb/WOContext.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WOContext.m (revision 1630) --- sope-appserver/NGObjWeb/WOContext.m (revision 1632)
+++ sope-appserver/NGObjWeb/WOContext.m (working copy) +++ sope-appserver/NGObjWeb/WOContext.m (working copy)
@@ -64,11 +64,13 @@ @@ -64,11 +64,13 @@
static BOOL testNSURLs = NO; static BOOL testNSURLs = NO;
@ -3707,7 +3800,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
serverURL = [@"http://" stringByAppendingString:host]; serverURL = [@"http://" stringByAppendingString:host];
Index: sope-appserver/NGObjWeb/ChangeLog Index: sope-appserver/NGObjWeb/ChangeLog
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/ChangeLog (revision 1630) --- sope-appserver/NGObjWeb/ChangeLog (revision 1632)
+++ sope-appserver/NGObjWeb/ChangeLog (working copy) +++ sope-appserver/NGObjWeb/ChangeLog (working copy)
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
* WOHttpAdaptor/WOHttpAdaptor.m: properly embed threaded request * WOHttpAdaptor/WOHttpAdaptor.m: properly embed threaded request
@ -3723,7 +3816,7 @@ Index: sope-appserver/NGObjWeb/ChangeLog
* WOHTTPURLHandle.m: add 'query' component of URL to request path * WOHTTPURLHandle.m: add 'query' component of URL to request path
Index: sope-appserver/NGObjWeb/DAVPropMap.plist Index: sope-appserver/NGObjWeb/DAVPropMap.plist
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1630) --- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1632)
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) +++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy)
@@ -24,13 +24,19 @@ @@ -24,13 +24,19 @@
"{DAV:}status" = "davStatus"; "{DAV:}status" = "davStatus";
@ -3807,7 +3900,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
"{http://groupdav.org/}component-set" = gdavComponentSet; "{http://groupdav.org/}component-set" = gdavComponentSet;
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1630) --- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1632)
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy) +++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy)
@@ -655,6 +655,7 @@ @@ -655,6 +655,7 @@
if (self->responses == nil) if (self->responses == nil)
@ -3819,7 +3912,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
case 'n': case 'n':
Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1630) --- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1632)
+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy) +++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy)
@@ -1523,16 +1523,16 @@ @@ -1523,16 +1523,16 @@
- (id)doREPORT:(WOContext *)_ctx { - (id)doREPORT:(WOContext *)_ctx {
@ -3907,7 +4000,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
/* DAV access control lists */ /* DAV access control lists */
Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1630) --- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1632)
+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) +++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy)
@@ -277,7 +277,8 @@ @@ -277,7 +277,8 @@
ok = [self renderLockToken:_object inContext:_ctx]; ok = [self renderLockToken:_object inContext:_ctx];
@ -3921,7 +4014,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
ok = [self renderStatusResult:_object ok = [self renderStatusResult:_object
Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1630) --- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1632)
+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy) +++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy)
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
properties:(NSDictionary *)_props properties:(NSDictionary *)_props
@ -3933,7 +4026,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h
inContext:(id)_ctx; inContext:(id)_ctx;
Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/WODirectAction.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WODirectAction.m (revision 1630) --- sope-appserver/NGObjWeb/WODirectAction.m (revision 1632)
+++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) +++ sope-appserver/NGObjWeb/WODirectAction.m (working copy)
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
} }
@ -3968,7 +4061,7 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1630) --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1632)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy)
@@ -216,6 +216,12 @@ @@ -216,6 +216,12 @@
assocCount++; assocCount++;
@ -3985,7 +4078,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1630) --- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1632)
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) +++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy)
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
WOAssociation *string; WOAssociation *string;
@ -4018,7 +4111,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
return NO; return NO;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1630) --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1632)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy)
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
WOAssociation *pageName; WOAssociation *pageName;
@ -4032,7 +4125,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
/* 'ivar' associations */ /* 'ivar' associations */
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1630) --- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1632)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) +++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy)
@@ -39,22 +39,34 @@ @@ -39,22 +39,34 @@
static int debugLookup = -1; static int debugLookup = -1;
@ -4183,7 +4276,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1630) --- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1632)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy) +++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy)
@@ -195,7 +195,8 @@ @@ -195,7 +195,8 @@
isCreateIfMissingMethod = YES; isCreateIfMissingMethod = YES;
@ -4197,7 +4290,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m
// TODO: the following are only create-if-missing on the target! // TODO: the following are only create-if-missing on the target!
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1630) --- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1632)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) +++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy)
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
#include <NGObjWeb/WOCookie.h> #include <NGObjWeb/WOCookie.h>
@ -4222,7 +4315,7 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
@implementation WOCoreApplication(SimpleParserSelection) @implementation WOCoreApplication(SimpleParserSelection)
Index: sope-appserver/NGObjWeb/Defaults.plist Index: sope-appserver/NGObjWeb/Defaults.plist
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/Defaults.plist (revision 1630) --- sope-appserver/NGObjWeb/Defaults.plist (revision 1632)
+++ sope-appserver/NGObjWeb/Defaults.plist (working copy) +++ sope-appserver/NGObjWeb/Defaults.plist (working copy)
@@ -216,7 +216,7 @@ @@ -216,7 +216,7 @@
SoWebDAVDisableCrossHostMoveCheck = NO; SoWebDAVDisableCrossHostMoveCheck = NO;
@ -4243,7 +4336,7 @@ Index: sope-appserver/NGObjWeb/Defaults.plist
DELETE, DELETE,
Index: sope-appserver/NGObjWeb/WORequest.m Index: sope-appserver/NGObjWeb/WORequest.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/WORequest.m (revision 1630) --- sope-appserver/NGObjWeb/WORequest.m (revision 1632)
+++ sope-appserver/NGObjWeb/WORequest.m (working copy) +++ sope-appserver/NGObjWeb/WORequest.m (working copy)
@@ -597,6 +597,8 @@ @@ -597,6 +597,8 @@
if (r.length > 0) if (r.length > 0)
@ -4256,7 +4349,7 @@ Index: sope-appserver/NGObjWeb/WORequest.m
if ((tmp = [self languageForBrowserLanguageCode:language])) if ((tmp = [self languageForBrowserLanguageCode:language]))
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1630) --- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1632)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy) +++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy)
@@ -62,6 +62,10 @@ @@ -62,6 +62,10 @@
/* RFC 3253 (DeltaV) */ /* RFC 3253 (DeltaV) */
@ -4271,7 +4364,7 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m
=================================================================== ===================================================================
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1630) --- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1632)
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy) +++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy)
@@ -59,6 +59,10 @@ @@ -59,6 +59,10 @@
/* RFC 3253 (DeltaV) */ /* RFC 3253 (DeltaV) */