Merge branch 'develop'

Author: helje5

sope-appserver/NGObjWeb/NGHttp/NGHttpHeaderFieldParser.m

@@ -29,10 +29,10 @@
 @implementation NGHttpStringHeaderFieldParser
 
 - (id)parseValue:(id)_data ofHeaderField:(NSString *)_field {
-  unsigned              len   = 0;
-  const unsigned char   *src  = NULL;
-  id                     value = nil;
-  NSString *str = nil;
+  unsigned            len   = 0;
+  const unsigned char *src  = NULL;
+  id                  value = nil;
+  NSString            *str  = nil;
 
   if ([_data isKindOfClass:[NSData class]]) {
     len   = [_data length];
@@ -341,8 +341,14 @@ - (void)dealloc {
 - (id)parseValuePart:(const char *)_bytes length:(unsigned)_len
   zone:(NSZone *)_z
 {
-  NGHttpCookie *cookie   = nil;
+  NGHttpCookie *cookie = nil;
   unsigned     pos, toGo;
+  
+  if (_bytes == NULL) {
+    NSLog(@"ERROR(%s:%i): got `nil` value for cookie pair: %u",
+          __PRETTY_FUNCTION__, __LINE__, _len);
+    return nil;
+  }
 
   for (pos = 0, toGo = _len; (toGo > 0) && (_bytes[pos] != '='); toGo--, pos++)
     ;
@@ -438,9 +444,9 @@ - (id)parseValue:(id)_data ofHeaderField:(NSString *)_field {
     else
       s = _data;
 
-    NSLog(@"ERROR(%s:%i): got invalid cookie pairs for field %@ data %@.",
+    NSLog(@"ERROR(%s:%i): got invalid cookie pairs for field '%@' data '%@', class=%@.",
           __PRETTY_FUNCTION__, __LINE__,
-          _field, s);
+          _field, s != nil ? @"<nil>" : s, [_data class]);
     RELEASE(s);
 #endif
     // return nil;

sope-appserver/NGObjWeb/WOApplication.m

@@ -704,7 +704,7 @@ - (void)performExpirationCheck:(NSTimer *)_timer {
   if ([self isRefusingNewSessions] &&
       ([self activeSessionsCount] < [self minimumActiveSessionsCount])) {
     /* check whether the application instance is still valid .. */
-    [self debugWithFormat:
+    [self logWithFormat:
             @"application terminates because it refuses new sessions and "
             @"the active session count (%i) is below the minimum (%i).",
             [self activeSessionsCount], [self minimumActiveSessionsCount]];
@@ -1209,7 +1209,7 @@ - (BOOL)shouldTerminate {
 }
 
 - (void)terminate {
-  [self debugWithFormat:
+  [self logWithFormat:
           @"application terminates:\n"
           @"  %i active sessions\n"
           @"  %i minimum active sessions\n"