1 Index: sope-mime/NGImap4/NGImap4Connection.m
2 ===================================================================
3 --- sope-mime/NGImap4/NGImap4Connection.m (révision 1546)
4 +++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
7 if (debugCache) [self logWithFormat:@" no folders cached yet .."];
9 - result = [[self client] list:(onlyFetchInbox ? @"INBOX" : @"*")
10 + result = [[self client] list:(onlyFetchInbox ? @"INBOX" : @"")
12 if (![[result valueForKey:@"result"] boolValue]) {
13 [self errorWithFormat:@"Could not list mailbox hierarchy!"];
14 Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
15 ===================================================================
16 --- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1546)
17 +++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
19 enumerator = [_flags objectEnumerator];
21 while ((obj = [enumerator nextObject])) {
22 - if (![obj isNotEmpty])
25 - if (![[obj substringToIndex:1] isEqualToString:@"\\"])
28 - objs[cnt] = [obj substringFromIndex:1];
30 + if ([obj isNotEmpty]) {
31 + if ([obj hasPrefix:@"\\"])
32 + objs[cnt] = [obj substringFromIndex:1];
38 result = [NSArray arrayWithObjects:objs count:cnt];
40 Index: sope-mime/NGImap4/NGImap4ResponseParser.m
41 ===================================================================
42 --- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1546)
43 +++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
45 static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
46 BOOL isBodyStructure);
48 +static NSArray *_parseLanguages();
50 static NSString *_parseBodyString(NGImap4ResponseParser *self,
52 static NSString *_parseBodyDecodeString(NGImap4ResponseParser *self,
54 static NSNumber *_parseUnsigned(NGImap4ResponseParser *self);
55 static NSString *_parseUntil(NGImap4ResponseParser *self, char _c);
56 static NSString *_parseUntil2(NGImap4ResponseParser *self, char _c1, char _c2);
57 +static BOOL _endsWithCQuote(NSString *_string);
59 static __inline__ NSException *_consumeIfMatch
60 (NGImap4ResponseParser *self, unsigned char _m);
64 - (NSString *)_parseQuotedString {
65 + NSMutableString *quotedString;
66 + NSString *tmpString;
69 /* parse a quoted string, eg '"' */
70 if (_la(self, 0) == '"') {
72 - return _parseUntil(self, '"');
73 + quotedString = [NSMutableString string];
76 + tmpString = _parseUntil(self, '"');
77 + [quotedString appendString: tmpString];
78 + if(_endsWithCQuote(tmpString)) {
79 + [quotedString deleteSuffix: @"\\"];
80 + [quotedString appendString: @"\""];
91 + return quotedString;
93 - (void)_consumeOptionalSpace {
94 if (_la(self, 0) == ' ') _consume(self, 1);
96 route = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
97 mailbox = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
98 host = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
101 if (_la(self, 0) != ')') {
102 [self logWithFormat:@"WARNING: IMAP4 envelope "
103 @"address not properly closed (c0=%c,c1=%c): %@",
104 @@ -1197,6 +1219,7 @@
105 address = [[NGImap4EnvelopeAddress alloc] initWithPersonalName:pname
106 sourceRoute:route mailbox:mailbox
112 @@ -1627,6 +1650,29 @@
113 return _parseBodyDecodeString(self, _convertString, NO /* no decode */);
116 +static NSArray *_parseLanguages(NGImap4ResponseParser *self) {
117 + NSMutableArray *languages;
118 + NSString *language;
120 + languages = [NSMutableArray array];
121 + if (_la(self, 0) == '(') {
122 + while (_la(self, 0) != ')') {
124 + language = _parseBodyString(self, YES);
125 + if ([language length])
126 + [languages addObject: language];
131 + language = _parseBodyString(self, YES);
132 + if ([language length])
133 + [languages addObject: language];
139 static NSDictionary *_parseBodyParameterList(NGImap4ResponseParser *self)
141 NSMutableDictionary *list;
142 @@ -1734,10 +1780,11 @@
143 *encoding, *bodysize;
144 NSDictionary *parameterList;
145 NSMutableDictionary *dict;
146 + NSArray *languages;
148 type = [_parseBodyString(self, YES) lowercaseString];
149 _consumeIfMatch(self, ' ');
150 - subtype = _parseBodyString(self, YES);
151 + subtype = [_parseBodyString(self, YES) lowercaseString];
152 _consumeIfMatch(self, ' ');
153 parameterList = _parseBodyParameterList(self);
154 _consumeIfMatch(self, ' ');
155 @@ -1762,7 +1809,8 @@
156 _consumeIfMatch(self, ' ');
157 [dict setObject:_parseBodyString(self, YES) forKey:@"lines"];
159 - else if ([type isEqualToString:@"message"]) {
160 + else if ([type isEqualToString:@"message"]
161 + && [subtype isEqualToString:@"rfc822"]) {
162 if (_la(self, 0) != ')') {
163 _consumeIfMatch(self, ' ');
164 _consumeIfMatch(self, '(');
165 @@ -1805,14 +1853,9 @@
166 forKey: @"disposition"];
167 if (_la(self, 0) != ')') {
169 - if (_la(self, 0) == '(') {
170 - [dict setObject: _parseBodyParameterList(self)
171 - forKey: @"language"];
174 - [dict setObject: _parseBodyString(self, YES)
175 - forKey: @"language"];
177 + languages = _parseLanguages(self);
178 + if ([languages count])
179 + [dict setObject: languages forKey: @"languages"];
180 if (_la(self, 0) != ')') {
182 [dict setObject: _parseBodyString(self, YES)
183 @@ -1829,6 +1872,7 @@
184 static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
185 BOOL isBodyStructure) {
186 NSMutableArray *parts;
187 + NSArray *languages;
189 NSMutableDictionary *dict;
191 @@ -1854,14 +1898,9 @@
192 forKey: @"disposition"];
193 if (_la(self, 0) != ')') {
195 - if (_la(self, 0) == '(') {
196 - [dict setObject: _parseBodyParameterList(self)
197 - forKey: @"language"];
200 - [dict setObject: _parseBodyString(self, YES)
201 - forKey: @"language"];
203 + languages = _parseLanguages(self);
204 + if ([languages count])
205 + [dict setObject: languages forKey: @"languages"];
206 if (_la(self, 0) != ')') {
208 [dict setObject: _parseBodyString(self, YES)
209 @@ -2170,6 +2209,21 @@
213 +static BOOL _endsWithCQuote(NSString *_string){
214 + unsigned int quoteSlashes;
218 + pos = [_string length] - 1;
220 + && [_string characterAtIndex: pos] == '\\') {
225 + return ((quoteSlashes % 2) == 1);
228 - (NSException *)exceptionForFailedMatch:(unsigned char)_match
229 got:(unsigned char)_avail
231 Index: sope-mime/NGMime/NGMimeBodyPart.m
232 ===================================================================
233 --- sope-mime/NGMime/NGMimeBodyPart.m (révision 1546)
234 +++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
239 -static NGMimeType *defaultType = nil;
241 -+ (void)initialize {
242 - static BOOL isInitialized = NO;
243 - if (!isInitialized) {
244 - isInitialized = YES;
247 - [[NGMimeType mimeType:@"text/plain; charset=us-ascii"] retain];
251 + (id)bodyPartWithHeader:(NGHashMap *)_header {
252 return [[[self alloc] initWithHeader:_header] autorelease];
254 @@ -156,13 +144,12 @@
256 Fields = (NGMimeHeaderNames *)[NGMimePartParser headerFieldNames];
259 type = [self->header objectForKey:Fields->contentType];
261 if (![type isKindOfClass:[NGMimeType class]])
262 type = [NGMimeType mimeType:[type stringValue]];
264 - return (type != nil ? type : (id)defaultType);
268 - (NSString *)contentId {
269 Index: sope-mime/NGMime/NGMimeBodyParser.m
270 ===================================================================
271 --- sope-mime/NGMime/NGMimeBodyParser.m (révision 1546)
272 +++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
274 if (_data == nil) return nil;
276 ctype = [_part contentType];
279 + && [_d respondsToSelector: @selector(parser:contentTypeOfPart:)])
280 + ctype = [_d parser: self contentTypeOfPart: _part];
282 if (![ctype isKindOfClass:[NGMimeType class]])
283 ctype = [NGMimeType mimeType:[ctype stringValue]];
285 Index: sope-mime/NGMime/NGMimePartParser.h
286 ===================================================================
287 --- sope-mime/NGMime/NGMimePartParser.h (révision 1546)
288 +++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
290 BOOL parserParseRawBodyDataOfPart:1;
291 BOOL parserBodyParserForPart:1;
292 BOOL parserDecodeBodyOfPart:1;
293 + BOOL parserContentTypeOfPart:1;
294 } delegateRespondsTo;
298 - (id<NGMimeBodyParser>)parser:(NGMimePartParser *)_parser
299 bodyParserForPart:(id<NGMimePart>)_part;
301 +- (NGMimeType *)parser:(id)_parser
302 + contentTypeOfPart:(id<NGMimePart>)_part;
304 @end /* NSObject(NGMimePartParserDelegate) */
306 @interface NSObject(NGMimePartParser)
307 Index: sope-mime/NGMime/NGMimePartParser.m
308 ===================================================================
309 --- sope-mime/NGMime/NGMimePartParser.m (révision 1546)
310 +++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
311 @@ -1091,7 +1091,10 @@
312 id<NGMimeBodyParser> bodyParser = nil;
314 ctype = [_p contentType];
317 + && self->delegateRespondsTo.parserContentTypeOfPart)
318 + ctype = [self->delegate parser: self contentTypeOfPart: _p];
320 contentType = ([ctype isKindOfClass:[NGMimeType class]])
322 : [NGMimeType mimeType:[ctype stringValue]];
323 Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.h
324 ===================================================================
325 --- sope-gdl1/PostgreSQL/PostgreSQL72Channel.h (révision 1546)
326 +++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.h (copie de travail)
328 #define ___PostgreSQL72_Channel_H___
330 #include <GDLAccess/EOAdaptorChannel.h>
331 +#include <GDLContentStore/EOAdaptorChannel+GCS.h>
332 #include <libpq-fe.h>
334 @class NSArray, NSString, NSMutableDictionary;
337 } PostgreSQL72FieldInfo;
339 -@interface PostgreSQL72Channel : EOAdaptorChannel
340 +@interface PostgreSQL72Channel : EOAdaptorChannel <GCSEOAdaptorChannel>
342 // connection is valid after an openChannel call
343 PGConnection *connection;
344 Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
345 ===================================================================
346 --- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1546)
347 +++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
352 +/* GCSEOAdaptorChannel protocol */
353 +static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
354 + @" c_name VARCHAR (256) NOT NULL,\n"
355 + @" c_content VARCHAR (100000) NOT NULL,\n"
356 + @" c_creationdate INT4 NOT NULL,\n"
357 + @" c_lastmodified INT4 NOT NULL,\n"
358 + @" c_version INT4 NOT NULL,\n"
359 + @" c_deleted INT4 NULL\n"
361 +static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
362 + @" c_uid VARCHAR (256) NOT NULL,\n"
363 + @" c_object VARCHAR (256) NOT NULL,\n"
364 + @" c_role VARCHAR (80) NOT NULL\n"
367 +- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
371 + sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
373 + return [self evaluateExpressionX: sql];
376 +- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
380 + sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
382 + return [self evaluateExpressionX: sql];
385 @end /* PostgreSQL72Channel */
387 @implementation PostgreSQL72Channel(PrimaryKeyGeneration)
388 Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
389 ===================================================================
390 --- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1546)
391 +++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
397 +after-install :: $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
399 +ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
400 +after-install :: $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
403 +$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make: ngobjweb.make
404 $(MKDIRS) $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/
405 $(INSTALL_DATA) ngobjweb.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
407 -ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
409 +$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make: woapp-gs.make
410 $(INSTALL_DATA) woapp-gs.make \
411 $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make
413 +$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make: wobundle-gs.make
414 $(INSTALL_DATA) wobundle-gs.make \
415 $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
417 Index: sope-appserver/NGObjWeb/WOContext.m
418 ===================================================================
419 --- sope-appserver/NGObjWeb/WOContext.m (révision 1546)
420 +++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
422 static BOOL testNSURLs = NO;
423 static BOOL newCURLStyle = NO;
424 static NSString *WOApplicationSuffix = nil;
425 +static NSURL *redirectURL = nil;
428 static BOOL didInit = NO;
436 debugCursor = [ud boolForKey:@"WODebugCursor"] ? 1 : 0;
437 debugComponentAwake = [ud boolForKey:@"WODebugComponentAwake"];
438 WOApplicationSuffix = [[ud stringForKey:@"WOApplicationSuffix"] copy];
439 + url = [ud stringForKey:@"WOApplicationRedirectURL"];
441 + redirectURL = [NSURL URLWithString: url];
444 + (id)contextWithRequest:(WORequest *)_r {
450 + // Use URL from user defaults (WOApplicationRedirectURL)
451 + return redirectURL;
454 if ((serverURL = [rq headerForKey:@"x-webobjects-server-url"]) == nil) {
455 if ((host = [rq headerForKey:@"host"]))
456 serverURL = [@"http://" stringByAppendingString:host];
457 Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
458 ===================================================================
459 --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1546)
460 +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
466 + if ((self->isAbsolute = OWGetProperty(_config, @"absolute"))) {
472 self->rest = _config;
474 Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
475 ===================================================================
476 --- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1546)
477 +++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
479 WOAssociation *string;
480 WOAssociation *target;
481 WOAssociation *disabled;
482 + WOAssociation *isAbsolute;
488 if ((self = [super initWithName:_name hyperlinkInfo:_info template:_t])) {
489 self->href = _info->href;
490 + self->isAbsolute = _info->isAbsolute;
495 // TODO: we need a binding to disable rewriting!
498 + if ([[self->isAbsolute valueInContext:_ctx] boolValue] == YES)
501 r = [_s rangeOfString:@":"];
504 Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
505 ===================================================================
506 --- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1546)
507 +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
509 WOAssociation *pageName;
510 WOAssociation *actionClass;
511 WOAssociation *directActionName;
513 + WOAssociation *isAbsolute;
517 /* 'ivar' associations */
518 Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
519 ===================================================================
520 --- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1546)
521 +++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
523 static int debugLookup = -1;
524 static int debugBaseURL = -1;
525 static int useRelativeURLs = -1;
526 +static int redirectInitted = -1;
527 +static NSURL *redirectURL = nil;
529 static void _initialize(void) {
531 + NSUserDefaults *ud;
533 + ud = [NSUserDefaults standardUserDefaults];
535 if (debugLookup == -1) {
536 - debugLookup = [[NSUserDefaults standardUserDefaults]
537 - boolForKey:@"SoDebugKeyLookup"] ? 1 : 0;
538 + debugLookup = [ud boolForKey:@"SoDebugKeyLookup"] ? 1 : 0;
539 NSLog(@"Note(SoObject): SoDebugKeyLookup is enabled!");
541 if (debugBaseURL == -1) {
542 - debugBaseURL = [[NSUserDefaults standardUserDefaults]
543 - boolForKey:@"SoDebugBaseURL"] ? 1 : 0;
544 + debugBaseURL = [ud boolForKey:@"SoDebugBaseURL"] ? 1 : 0;
545 NSLog(@"Note(SoObject): SoDebugBaseURL is enabled!");
547 if (useRelativeURLs == -1) {
548 - useRelativeURLs = [[NSUserDefaults standardUserDefaults]
549 - boolForKey:@"WOUseRelativeURLs"] ?1:0;
550 + useRelativeURLs = [ud boolForKey:@"WOUseRelativeURLs"] ?1:0;
551 NSLog(@"Note(SoObject): relative base URLs are enabled.");
553 + if (redirectInitted == -1) {
554 + url = [ud stringForKey:@"WOApplicationRedirectURL"];
555 + if ([url length]) {
556 + redirectURL = [[NSURL alloc] initWithString: url];
558 + redirectInitted = 1;
563 @@ -318,56 +330,61 @@
566 ms = [[NSMutableString alloc] initWithCapacity:128];
569 + [ms appendString: [redirectURL absoluteString]];
572 + if (!useRelativeURLs) {
573 + port = [[rq headerForKey:@"x-webobjects-server-port"] intValue];
575 - if (!useRelativeURLs) {
576 - port = [[rq headerForKey:@"x-webobjects-server-port"] intValue];
578 - /* this is actually a bug in Apache */
580 - static BOOL didWarn = NO;
582 - [self warnWithFormat:@"(%s:%i): got an empty port from Apache!",
583 - __PRETTY_FUNCTION__, __LINE__];
585 + /* this is actually a bug in Apache */
587 + static BOOL didWarn = NO;
589 + [self warnWithFormat:@"(%s:%i): got an empty port from Apache!",
590 + __PRETTY_FUNCTION__, __LINE__];
598 - if ((tmp = [rq headerForKey:@"host"]) != nil) {
599 - /* check whether we have a host header with port */
600 - if ([tmp rangeOfString:@":"].length == 0)
603 - if (tmp != nil) { /* we have a host header with port */
605 - [[rq headerForKey:@"x-webobjects-server-url"] hasPrefix:@"https"];
606 - [ms appendString:isHTTPS ? @"https://" : @"http://"];
607 - [ms appendString:tmp];
609 - else if ((tmp = [rq headerForKey:@"x-webobjects-server-url"]) != nil) {
610 - /* sometimes the URL is just wrong! (suggests port 80) */
611 - if ([tmp hasSuffix:@":0"] && [tmp length] > 2) { // TODO: bad bad bad
612 - [self warnWithFormat:@"%s: got incorrect URL from Apache: '%@'",
613 - __PRETTY_FUNCTION__, tmp];
614 - tmp = [tmp substringToIndex:([tmp length] - 2)];
615 + if ((tmp = [rq headerForKey:@"host"]) != nil) {
616 + /* check whether we have a host header with port */
617 + if ([tmp rangeOfString:@":"].length == 0)
620 - else if ([tmp hasSuffix:@":443"] && [tmp hasPrefix:@"http://"]) {
621 - /* see OGo bug #1435, Debian Apache hack */
622 - [self warnWithFormat:@"%s: got 'http' protocol but 443 port, "
623 - @"assuming Debian/Apache bug (OGo #1435): '%@'",
624 - __PRETTY_FUNCTION__, tmp];
625 - tmp = [tmp substringWithRange:NSMakeRange(4, [tmp length] - 4 - 4)];
626 - tmp = [@"https" stringByAppendingString:tmp];
627 + if (tmp != nil) { /* we have a host header with port */
629 + [[rq headerForKey:@"x-webobjects-server-url"] hasPrefix:@"https"];
630 + [ms appendString:isHTTPS ? @"https://" : @"http://"];
631 + [ms appendString:tmp];
633 - [ms appendString:tmp];
636 - // TODO: isHTTPS always no in this case?
637 - [ms appendString:isHTTPS ? @"https://" : @"http://"];
638 + else if ((tmp = [rq headerForKey:@"x-webobjects-server-url"]) != nil) {
639 + /* sometimes the URL is just wrong! (suggests port 80) */
640 + if ([tmp hasSuffix:@":0"] && [tmp length] > 2) { // TODO: bad bad bad
641 + [self warnWithFormat:@"%s: got incorrect URL from Apache: '%@'",
642 + __PRETTY_FUNCTION__, tmp];
643 + tmp = [tmp substringToIndex:([tmp length] - 2)];
645 + else if ([tmp hasSuffix:@":443"] && [tmp hasPrefix:@"http://"]) {
646 + /* see OGo bug #1435, Debian Apache hack */
647 + [self warnWithFormat:@"%s: got 'http' protocol but 443 port, "
648 + @"assuming Debian/Apache bug (OGo #1435): '%@'",
649 + __PRETTY_FUNCTION__, tmp];
650 + tmp = [tmp substringWithRange:NSMakeRange(4, [tmp length] - 4 - 4)];
651 + tmp = [@"https" stringByAppendingString:tmp];
653 + [ms appendString:tmp];
656 + // TODO: isHTTPS always no in this case?
657 + [ms appendString:isHTTPS ? @"https://" : @"http://"];
659 - [ms appendString:[rq headerForKey:@"x-webobjects-server-name"]];
660 - if ((isHTTPS ? (port != 443) : (port != 80)) && port != 0)
661 - [ms appendFormat:@":%i", port];
662 + [ms appendString:[rq headerForKey:@"x-webobjects-server-name"]];
663 + if ((isHTTPS ? (port != 443) : (port != 80)) && port != 0)
664 + [ms appendFormat:@":%i", port];
669 Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
670 ===================================================================
671 --- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1546)
672 +++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
674 #include <NGObjWeb/WOCookie.h>
675 #include <NGExtensions/NSData+gzip.h>
676 #include <NGHttp/NGHttp.h>
677 +#include <NGMime/NGMimeType.h>
681 @@ -1016,6 +1017,12 @@
682 - (void)parser:(NGMimePartParser *)_parser didParseHeader:(NGHashMap *)_header {
685 +- (NGMimeType *)parser:(id)_parser
686 + contentTypeOfPart:(id<NGMimePart>)_part
688 + return [NGMimeType mimeType: @"text/plain; charset=utf-8"];
691 @end /* WOHttpAdaptor */
693 @implementation WOCoreApplication(SimpleParserSelection)