--- a/omadrm/drmengine/roap/src/RoapHttpHandler.cpp	Tue Aug 31 15:29:38 2010 +0300
+++ b/omadrm/drmengine/roap/src/RoapHttpHandler.cpp	Wed Sep 01 12:21:16 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -21,20 +21,16 @@
 #include <http/thttphdrval.h>
 #include <httpfiltercommonstringsext.h>
 
+#include "RoapHttpHandler.h"
+#include "RoapObserver.h"
+#include "RoapDef.h"
+#include "RoapLog.h"
+
 //#include <CookieFilterInterface.h>
 //#include <uaproffilter_interface.h>
 //#include <HttpFilterProxyInterface.h>
 #include <httpfilteriopinterface.h>
 
-#include "RoapHttpHandler.h"
-#include "RoapConnection.h"
-#include "RoapResponse.h"
-#include "RoapObserver.h"
-#include "RoapDef.h"
-#include "RoapLog.h"
-
-#include "buffercontainers.h"
-
 
 using namespace Roap;
 
@@ -43,8 +39,12 @@
 // The time out value in HTTP, 30 sec
 LOCAL_D const TInt KRoapTimeoutValue = 60000000;
 
-_LIT8( KTestUserName, "" );
-_LIT8( KTestPassword, "" );
+_LIT8( KTestUserName, "iopvf" );
+_LIT8( KTestPassword, "r72005" );
+/*
+_LIT8( KTestUserName, "moria" );
+_LIT8( KTestPassword, "mellon" );
+*/
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -564,7 +564,6 @@
             {
             LOG( _L("HTTP event ERedirectRequiresConfirmation received") );
             iTransaction.SubmitL();
-            break;
             }
 
         default:
@@ -642,13 +641,13 @@
 
         if ( iResponse->iDataType == TDataType( KMultipartRelatedType ) )
             {
-            DRM::CPathContainer* tempPath( DRM::CPathContainer::NewLC() );
-            DRM::CFileNameContainer* fileName( DRM::CFileNameContainer::NewLC() );
+            TPath tempPath;
+            TFileName fileName;
             TInt maxSize( 0 );
 
             if ( iObserver )
                 {
-                iObserver->ContentDownloadInfoL( tempPath->iBuffer, fileName->iBuffer, maxSize );
+                iObserver->ContentDownloadInfoL( tempPath, fileName, maxSize );
                 }
 
             boundaryStr = srtPool.StringF( HttpFilterCommonStringsExt::EBoundary,
@@ -667,10 +666,8 @@
                 LOG( _L("Error: multipart boundary missing") );
                    User::Leave( KErrRoapGeneral );
                 }
-            iResponse->SetDcfPathL( tempPath->iBuffer );
-            iResponse->SetContentNameL( fileName->iBuffer );
-            CleanupStack::PopAndDestroy( fileName );
-            CleanupStack::PopAndDestroy( tempPath );
+            iResponse->SetDcfPathL( tempPath );
+            iResponse->SetContentNameL( fileName );
             iReportBytes = ETrue;
 
             if ( iObserver )