Monotone-Parent: 4670a90c9e9ff683de9c0300911f03d344608d48
Monotone-Revision: b030752b6cabcd3607b11fcc413263019718b79e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-08-18T15:18:10 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
9325ae4909
commit
c0fc87c333
|
@ -1,8 +1,17 @@
|
|||
Index: sope-mime/NGImap4/NGImap4Client.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4Client.m (révision 1623)
|
||||
--- sope-mime/NGImap4/NGImap4Client.m (révision 1625)
|
||||
+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail)
|
||||
@@ -53,17 +53,17 @@
|
||||
@@ -24,6 +24,8 @@
|
||||
#include "NGImap4Client.h"
|
||||
#include "NGImap4Context.h"
|
||||
#include "NGImap4Support.h"
|
||||
+#include "NGImap4Envelope.h"
|
||||
+#include "NGImap4EnvelopeAddress.h"
|
||||
#include "NGImap4Functions.h"
|
||||
#include "NGImap4ResponseParser.h"
|
||||
#include "NGImap4ResponseNormalizer.h"
|
||||
@@ -53,17 +55,17 @@
|
||||
|
||||
@end /* NGImap4Client(ConnectionRegistration); */
|
||||
|
||||
|
@ -29,7 +38,16 @@ Index: sope-mime/NGImap4/NGImap4Client.m
|
|||
|
||||
@interface NGImap4Client(Private)
|
||||
|
||||
@@ -967,11 +967,12 @@
|
||||
@@ -84,6 +86,8 @@
|
||||
|
||||
- (NSDictionary *)login;
|
||||
|
||||
+- (NSDictionary *) _sopeSORT: (id)_sortSpec qualifier:(EOQualifier *)_qual encoding:(NSString *)_encoding;
|
||||
+
|
||||
@end
|
||||
|
||||
/*
|
||||
@@ -967,11 +971,12 @@
|
||||
descr = @"Could not process qualifier for imap search ";
|
||||
descr = [descr stringByAppendingString:reason];
|
||||
|
||||
|
@ -45,9 +63,130 @@ Index: sope-mime/NGImap4/NGImap4Client.m
|
|||
}
|
||||
|
||||
- (NSString *)_searchExprForQual:(EOQualifier *)_qualifier {
|
||||
@@ -1093,7 +1098,18 @@
|
||||
Eg: UID SORT ( DATE REVERSE SUBJECT ) UTF-8 TODO
|
||||
*/
|
||||
NSString *tmp;
|
||||
+ NSArray *capa;
|
||||
|
||||
+ // We first check to see if our server supports IMAP SORT. If not
|
||||
+ // we'll sort ourself the results.
|
||||
+ capa = [[self capability] objectForKey: @"capability"];
|
||||
+
|
||||
+ if ([capa indexOfObject: @"sort"] == NSNotFound)
|
||||
+ {
|
||||
+ return [self _sopeSORT: _sortSpec qualifier: _qual encoding: _encoding];
|
||||
+ }
|
||||
+
|
||||
+
|
||||
if ([_sortSpec isKindOfClass:[NSArray class]])
|
||||
tmp = [self _generateIMAP4SortOrderings:_sortSpec];
|
||||
else if ([_sortSpec isKindOfClass:[EOSortOrdering class]])
|
||||
@@ -1107,9 +1123,10 @@
|
||||
tmp = @"DATE";
|
||||
}
|
||||
|
||||
+
|
||||
return [self primarySort:tmp
|
||||
- qualifierString:[self _searchExprForQual:_qual]
|
||||
- encoding:_encoding];
|
||||
+ qualifierString:[self _searchExprForQual:_qual]
|
||||
+ encoding:_encoding];
|
||||
}
|
||||
- (NSDictionary *)sort:(NSArray *)_sortOrderings
|
||||
qualifier:(EOQualifier *)_qual
|
||||
@@ -1130,7 +1147,7 @@
|
||||
return nil;
|
||||
}
|
||||
|
||||
- s = [@"search" stringByAppendingString:s];
|
||||
+ s = [@"UID SEARCH" stringByAppendingString:s];
|
||||
return [self->normer normalizeSearchResponse:[self processCommand:s]];
|
||||
}
|
||||
|
||||
@@ -1193,6 +1210,79 @@
|
||||
|
||||
/* Private Methods */
|
||||
|
||||
+- (NSDictionary *) _sopeSORT: (id)_sortSpec qualifier:(EOQualifier *)_qual encoding:(NSString *)_encoding {
|
||||
+
|
||||
+ NSMutableDictionary *result;
|
||||
+ NSDictionary *d;
|
||||
+
|
||||
+ result = [[[NSMutableDictionary alloc] init] autorelease];
|
||||
+ [result setObject: [NSNumber numberWithBool: NO] forKey: @"result"];
|
||||
+
|
||||
+ // _sortSpec: [REVERSE] {DATE,FROM,SUBJECT}
|
||||
+ d = [self searchWithQualifier: _qual];
|
||||
+
|
||||
+ if ((d = [d objectForKey: @"RawResponse"]))
|
||||
+ {
|
||||
+ NSMutableDictionary *dict;
|
||||
+ NSArray *a, *s_a;
|
||||
+ BOOL b;
|
||||
+ int i;
|
||||
+
|
||||
+ a = [d objectForKey: @"search"];
|
||||
+ d = [self fetchUids: a parts: [NSArray arrayWithObject: @"ENVELOPE"]];
|
||||
+ a = [d objectForKey: @"fetch"];
|
||||
+
|
||||
+
|
||||
+ dict = [[[NSMutableDictionary alloc] init] autorelease];
|
||||
+ b = YES;
|
||||
+
|
||||
+ for (i = 0; i < [a count]; i++)
|
||||
+ {
|
||||
+ NGImap4Envelope *env;
|
||||
+ id o, uid, s;
|
||||
+
|
||||
+ o = [a objectAtIndex: i];
|
||||
+ env = [o objectForKey: @"envelope"];
|
||||
+ uid = [o objectForKey: @"uid"];
|
||||
+
|
||||
+ if ([_sortSpec rangeOfString: @"SUBJECT"].length)
|
||||
+ {
|
||||
+ s = [env subject];
|
||||
+ if ([s isKindOfClass: [NSData class]])
|
||||
+ s = [[[NSString alloc] initWithData: s encoding: NSUTF8StringEncoding] autorelease];
|
||||
+
|
||||
+ [dict setObject: (s != nil ? s : (id)@"") forKey: uid];
|
||||
+ }
|
||||
+ else if ([_sortSpec rangeOfString: @"FROM"].length)
|
||||
+ {
|
||||
+ s = [[[env from] lastObject] email];
|
||||
+ [dict setObject: (s != nil ? s : (id)@"") forKey: uid];
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ [dict setObject: [env date] forKey: uid];
|
||||
+ b = NO;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (b)
|
||||
+ s_a = [dict keysSortedByValueUsingSelector: @selector(caseInsensitiveCompare:)];
|
||||
+ else
|
||||
+ s_a = [dict keysSortedByValueUsingSelector: @selector(compare:)];
|
||||
+
|
||||
+ if ([_sortSpec rangeOfString: @"REVERSE"].length)
|
||||
+ {
|
||||
+ s_a = [[s_a reverseObjectEnumerator] allObjects];
|
||||
+ }
|
||||
+
|
||||
+ [result setObject: [NSNumber numberWithBool: YES] forKey: @"result"];
|
||||
+ [result setObject: s_a forKey: @"sort"];
|
||||
+ }
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
+
|
||||
- (NSException *)_processCommandParserException:(NSException *)_exception {
|
||||
[self logWithFormat:@"ERROR(%s): catched IMAP4 parser exception %@: %@",
|
||||
__PRETTY_FUNCTION__, [_exception name], [_exception reason]];
|
||||
Index: sope-mime/NGImap4/NGImap4Connection.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1623)
|
||||
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1625)
|
||||
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
|
||||
@@ -381,7 +381,7 @@
|
||||
|
||||
|
@ -60,7 +199,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
|
|||
[self errorWithFormat:@"Could not list mailbox hierarchy!"];
|
||||
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1623)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1625)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
|
||||
@@ -648,14 +648,13 @@
|
||||
enumerator = [_flags objectEnumerator];
|
||||
|
@ -86,7 +225,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
|
|||
if (objs) free(objs);
|
||||
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1623)
|
||||
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1625)
|
||||
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
|
||||
@@ -84,6 +84,8 @@
|
||||
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
|
||||
|
@ -311,7 +450,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
|
|||
{
|
||||
Index: sope-mime/NGMail/NGSmtpClient.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1623)
|
||||
--- sope-mime/NGMail/NGSmtpClient.m (révision 1625)
|
||||
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
|
||||
@@ -24,6 +24,82 @@
|
||||
#include "NGSmtpReplyCodes.h"
|
||||
|
@ -467,7 +606,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
|
|||
reply = [self receiveReply];
|
||||
Index: sope-mime/NGMail/NGMailAddressParser.h
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMailAddressParser.h (révision 1623)
|
||||
--- sope-mime/NGMail/NGMailAddressParser.h (révision 1625)
|
||||
+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail)
|
||||
@@ -24,7 +24,9 @@
|
||||
|
||||
|
@ -505,7 +644,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.h
|
|||
|
||||
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1623)
|
||||
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1625)
|
||||
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
|
||||
@@ -86,37 +86,40 @@
|
||||
char *des = NULL;
|
||||
|
@ -571,7 +710,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
|
|||
unsigned isoEndLen = 2;
|
||||
Index: sope-mime/NGMail/NGMailAddressParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMail/NGMailAddressParser.m (révision 1623)
|
||||
--- sope-mime/NGMail/NGMailAddressParser.m (révision 1625)
|
||||
+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail)
|
||||
@@ -52,9 +52,9 @@
|
||||
StrClass = [NSString class];
|
||||
|
@ -683,7 +822,7 @@ Index: sope-mime/NGMail/NGMailAddressParser.m
|
|||
self->dataPos = 0;
|
||||
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
|
||||
@@ -19,88 +19,45 @@
|
||||
02111-1307, USA.
|
||||
|
@ -1078,7 +1217,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
|
|||
#if 0
|
||||
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
|
||||
@@ -77,6 +77,7 @@
|
||||
[rfc822Set setGenerator:gen forField:@"bcc"];
|
||||
|
@ -1090,7 +1229,7 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
|
|||
|
||||
Index: sope-mime/NGMime/NGMimeBodyPart.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
|
||||
@@ -31,18 +31,6 @@
|
||||
return 2;
|
||||
|
@ -1128,7 +1267,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
|
|||
- (NSString *)contentId {
|
||||
Index: sope-mime/NGMime/GNUmakefile.preamble
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1623)
|
||||
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1625)
|
||||
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
|
||||
@@ -5,6 +5,11 @@
|
||||
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
|
||||
|
@ -1144,7 +1283,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
|
|||
-I../../sope-core/NGStreams/ \
|
||||
Index: sope-mime/NGMime/NGMimeBodyParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
|
||||
@@ -67,7 +67,10 @@
|
||||
if (_data == nil) return nil;
|
||||
|
@ -1160,7 +1299,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
|
|||
|
||||
Index: sope-mime/NGMime/NGMimePartParser.h
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimePartParser.h (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
|
||||
@@ -117,6 +117,7 @@
|
||||
BOOL parserParseRawBodyDataOfPart:1;
|
||||
|
@ -1182,7 +1321,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
|
|||
@interface NSObject(NGMimePartParser)
|
||||
Index: sope-mime/NGMime/NGMimePartParser.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimePartParser.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
|
||||
@@ -227,7 +227,7 @@
|
||||
}
|
||||
|
@ -1207,7 +1346,7 @@ Index: sope-mime/NGMime/NGMimePartParser.m
|
|||
: [NGMimeType mimeType:[ctype stringValue]];
|
||||
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
|
||||
@@ -130,8 +130,13 @@
|
||||
|
||||
|
@ -1238,7 +1377,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
|
|||
bufLen = [data length];
|
||||
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
||||
===================================================================
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1623)
|
||||
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1625)
|
||||
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
|
||||
@@ -49,80 +49,70 @@
|
||||
|
||||
|
@ -1374,7 +1513,7 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
|
|||
}
|
||||
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1623)
|
||||
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1625)
|
||||
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
|
||||
@@ -713,6 +713,39 @@
|
||||
return ms;
|
||||
|
@ -1418,7 +1557,7 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
|
|||
@implementation PostgreSQL72Channel(PrimaryKeyGeneration)
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1623)
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1625)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail)
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
|
@ -1513,7 +1652,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
|
|||
@" c_lastmodified INTEGER NOT NULL,\n"
|
||||
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
||||
===================================================================
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1623)
|
||||
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1625)
|
||||
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail)
|
||||
@@ -31,6 +31,8 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
@ -1561,7 +1700,7 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
|
|||
|
||||
Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1623)
|
||||
--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1625)
|
||||
+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail)
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
|
@ -1599,7 +1738,7 @@ 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 (révision 1623)
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1625)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail)
|
||||
@@ -39,18 +39,6 @@
|
||||
: (NSString *)[[self copy] autorelease];
|
||||
|
@ -1688,7 +1827,7 @@ 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 (révision 1623)
|
||||
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1625)
|
||||
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
|
||||
@@ -140,8 +140,12 @@
|
||||
|
||||
|
@ -1731,7 +1870,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
|
|||
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
|
||||
Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
|
||||
===================================================================
|
||||
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1623)
|
||||
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1625)
|
||||
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail)
|
||||
@@ -19,6 +19,7 @@
|
||||
02111-1307, USA.
|
||||
|
@ -1743,7 +1882,7 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
|
|||
|
||||
Index: sope-core/NGStreams/GNUmakefile.preamble
|
||||
===================================================================
|
||||
--- sope-core/NGStreams/GNUmakefile.preamble (révision 1623)
|
||||
--- sope-core/NGStreams/GNUmakefile.preamble (révision 1625)
|
||||
+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail)
|
||||
@@ -1,7 +1,10 @@
|
||||
# compilation settings
|
||||
|
@ -1758,7 +1897,7 @@ Index: sope-core/NGStreams/GNUmakefile.preamble
|
|||
-I..
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1623)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1625)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
|
||||
@@ -19,6 +19,8 @@
|
||||
02111-1307, USA.
|
||||
|
@ -1780,7 +1919,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
|
|||
id<NSObject,SaxEntityResolver> entityResolver;
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1623)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1625)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
|
||||
@@ -30,6 +30,12 @@
|
||||
#include <libxml/HTMLparser.h>
|
||||
|
@ -1840,7 +1979,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
|
|||
- (void)tearDownParser {
|
||||
Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
|
||||
===================================================================
|
||||
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1623)
|
||||
--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (révision 1625)
|
||||
+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail)
|
||||
@@ -614,7 +614,7 @@
|
||||
xmlParseDocument(ctxt);
|
||||
|
@ -1862,7 +2001,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
|
|||
xmlFreeParserCtxt(self->ctxt);
|
||||
Index: sope-appserver/mod_ngobjweb/config.c
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/config.c (révision 1623)
|
||||
--- sope-appserver/mod_ngobjweb/config.c (révision 1625)
|
||||
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
|
@ -1873,9 +2012,21 @@ 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 (révision 1625)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
|
||||
@@ -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
|
||||
===================================================================
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1623)
|
||||
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1625)
|
||||
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
|
||||
@@ -82,7 +82,7 @@
|
||||
|
||||
|
@ -1896,21 +2047,9 @@ 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 1623)
|
||||
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
|
||||
@@ -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
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
|
||||
@@ -23,14 +23,20 @@
|
||||
|
||||
|
@ -1942,7 +2081,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
|
|||
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
|
||||
Index: sope-appserver/NGObjWeb/WOContext.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WOContext.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
|
||||
@@ -64,11 +64,13 @@
|
||||
static BOOL testNSURLs = NO;
|
||||
|
@ -1982,7 +2121,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
|
|||
serverURL = [@"http://" stringByAppendingString:host];
|
||||
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
|
||||
@@ -24,13 +24,19 @@
|
||||
"{DAV:}status" = "davStatus";
|
||||
|
@ -2060,7 +2199,7 @@ 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 (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
|
||||
@@ -655,6 +655,7 @@
|
||||
if (self->responses == nil)
|
||||
|
@ -2072,7 +2211,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
|
|||
case 'n':
|
||||
Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail)
|
||||
@@ -1523,16 +1523,16 @@
|
||||
- (id)doREPORT:(WOContext *)_ctx {
|
||||
|
@ -2160,7 +2299,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
|
|||
/* DAV access control lists */
|
||||
Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail)
|
||||
@@ -277,7 +277,8 @@
|
||||
ok = [self renderLockToken:_object inContext:_ctx];
|
||||
|
@ -2174,7 +2313,7 @@ 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 (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail)
|
||||
@@ -62,6 +62,7 @@
|
||||
properties:(NSDictionary *)_props
|
||||
|
@ -2186,7 +2325,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h
|
|||
inContext:(id)_ctx;
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
|
||||
@@ -216,6 +216,12 @@
|
||||
assocCount++;
|
||||
|
@ -2203,7 +2342,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
|
|||
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
|
||||
@@ -41,6 +41,7 @@
|
||||
WOAssociation *string;
|
||||
|
@ -2236,7 +2375,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
|
|||
return NO;
|
||||
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
|
||||
@@ -41,7 +41,8 @@
|
||||
WOAssociation *pageName;
|
||||
|
@ -2250,7 +2389,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
|
|||
/* 'ivar' associations */
|
||||
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
|
||||
@@ -39,22 +39,34 @@
|
||||
static int debugLookup = -1;
|
||||
|
@ -2401,7 +2540,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
|
|||
|
||||
Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail)
|
||||
@@ -195,7 +195,8 @@
|
||||
isCreateIfMissingMethod = YES;
|
||||
|
@ -2415,7 +2554,7 @@ 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 (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <NGObjWeb/WOCookie.h>
|
||||
|
@ -2440,7 +2579,7 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
|
|||
@implementation WOCoreApplication(SimpleParserSelection)
|
||||
Index: sope-appserver/NGObjWeb/Defaults.plist
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/Defaults.plist (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/Defaults.plist (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail)
|
||||
@@ -216,7 +216,7 @@
|
||||
SoWebDAVDisableCrossHostMoveCheck = NO;
|
||||
|
@ -2461,7 +2600,7 @@ Index: sope-appserver/NGObjWeb/Defaults.plist
|
|||
DELETE,
|
||||
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail)
|
||||
@@ -62,6 +62,10 @@
|
||||
/* RFC 3253 (DeltaV) */
|
||||
|
@ -2476,7 +2615,7 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h
|
|||
|
||||
Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m
|
||||
===================================================================
|
||||
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1623)
|
||||
--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (révision 1625)
|
||||
+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail)
|
||||
@@ -59,6 +59,10 @@
|
||||
/* RFC 3253 (DeltaV) */
|
||||
|
|
Loading…
Reference in New Issue