--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -15,31 +15,30 @@
*
*/
+
#include "FeedsDatabase.h"
#include "FeedHandler.h"
#include "FeedsServer.h"
-#include <feedsservermsg.h>
+#include "FeedsServerMsg.h"
#include "FeedsServerSession.h"
#include "OpmlParser.h"
#include "OpmlWriter.h"
#include "PackedFolder.h"
#include "ServerHttpConnection.h"
#include "Logger.h"
-#include <xmlutils.h>
+#include "XMLUtils.h"
#include "BackRestoreHandler.h"
#include "UpdateManager.h"
// CONSTANTS
_LIT(KFeedsServerPanic, "FeedsServer");
-// opml files are generally smaller in size.But if a malformed opml
-// greater than 400kB would cause the system to be irresponsive.
-// So limit the max size to 400 kB
-const TInt KMaxOPMLFileSize = 409600;
+
//_LIT(KFileSchema, "file://c:");
_LIT(KDefaultFeed, "default_feeds.xml");
_LIT(KDefaultOPMLFileParam, "");
+
// -----------------------------------------------------------------------------
// CFeedsServer::NewL
//
@@ -388,10 +387,7 @@
// Read file
User::LeaveIfError(aFile.Size(size));
- if ( size > KMaxOPMLFileSize )
- {
- User::Leave(KErrCorrupt);
- }
+
buffer = HBufC8::NewLC(size);
bufferPtr.Set(buffer->Des());
@@ -564,7 +560,6 @@
void CFeedsServer::ScheduleUpdateManagerL()
{
RArray<TInt> folderListIds;
- CleanupClosePushL(folderListIds);
TBool autoUpdate = EFalse;
TInt autoUpdateFreq = 0;
TUint32 autoUpdateAP = 0;
@@ -583,8 +578,6 @@
}
}
}
-
- CleanupStack::PopAndDestroy(); //folderListIds
}
// -----------------------------------------------------------------------------