Merge to 2.2.8

Alinto · Sep 10, 2014 · 3295520 · 3295520
2 parents 04904d8 + 38cb86b
commit 3295520
Show file tree

Hide file tree

Showing 269 changed files with 9,265 additions and 6,030 deletions.
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -457,13 +457,12 @@ - (void) processFolderDelete: (id <DOMElement>) theDocumentElement
       NSData *d;
 
       //
-      // We mark the cache object as deleted
+      // We destroy the cache object
       //
       key = [NSString stringWithFormat: @"%@+%@", [context objectForKey: @"DeviceId"], [folderToDelete nameInContainer]];
       o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
       [o setTableUrl: [self folderTableURL]];
-      [o reloadIfNeeded];
-      [o delete];
+      [o destroy];
 
       //
       // We update the FolderSync's synckey
@@ -697,7 +696,7 @@ - (void) processFolderSync: (id <DOMElement>) theDocumentElement
 
           if (![imapGUIDs allKeysForObject: cKey])
             {
-              // Delete folders cache content to avoid stale data if a new folder gets created with the same name
+              // Destroy folders cache content to avoid stale data if a new folder gets created with the same name
               key =  [NSString stringWithFormat: @"%@+folder%@", [context objectForKey: @"DeviceId"], [cachedGUIDs objectForKey: cKey]];
               o = [SOGoCacheGCSObject objectWithName: key  inContainer: nil];
               [o setObjectType: ActiveSyncFolderCacheObject];
@@ -711,8 +710,7 @@ - (void) processFolderSync: (id <DOMElement>) theDocumentElement
                   command_count++;
                 }
 
-              [[o properties] removeAllObjects];
-              [o save];
+              [o destroy];
             }
         }
 

diff --git a/ActiveSync/common.make b/ActiveSync/common.make
@@ -18,7 +18,6 @@ ADDITIONAL_INCLUDE_DIRS += \
 ADDITIONAL_LIB_DIRS += \
         -L../SoObjects/SOGo/SOGo.framework/ \
 	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
-	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
         -L/usr/local/lib
 

diff --git a/Apache/SOGo-apple-ab.conf b/Apache/SOGo-apple-ab.conf
@@ -28,8 +28,13 @@
   ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
   ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
   <Location />
-    Order allow,deny
-    Allow from all
+    <IfVersion < 2.4>      
+      Order deny,allow
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
   </Location>
 
   <Proxy http://127.0.0.1:20000>

diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
@@ -5,8 +5,14 @@ Alias /SOGo/WebServerResources/ \
 
 <Directory /usr/lib/GNUstep/SOGo/>
     AllowOverride None
-    Order deny,allow
-    Allow from all
+
+    <IfVersion < 2.4>      
+        Order deny,allow
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 
     # Explicitly allow caching of static content to avoid browser specific behavior.
     # A resource's URL MUST change in order to have the client load the new version.