--- a/omadrm/drmplugins/drmfilter/src/HTTPFilterDRM.cpp	Tue Aug 31 15:29:38 2010 +0300
+++ b/omadrm/drmplugins/drmfilter/src/HTTPFilterDRM.cpp	Wed Sep 01 12:21:16 2010 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (c) 2006 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"
@@ -217,7 +217,7 @@
 
 //------------------------------------------------------------------------
 // CHTTPFilterDRM::MHFRunL
-// See MHTTPFilterBase::MHFRunL
+// See MHTTPFilterBase::MHFRunL 
 //------------------------------------------------------------------------
 //
 void CHTTPFilterDRM::MHFRunL( RHTTPTransaction aTransaction,
@@ -320,7 +320,7 @@
         case KErrCANoRights:
         case KErrCorrupt:
             {
-            error = NW_STAT_FAILURE; //Unable to perform operation
+            error = NW_STAT_FAILURE; //Unable to perform operation   
             }
             break;
         case KErrArgument:
@@ -461,10 +461,10 @@
 // CHTTPFilterDRM::CheckHeadersL
 // Check HTTP headers and extract MIME type
 //------------------------------------------------------------------------
-//
+// 
 void CHTTPFilterDRM::CheckHeadersL( const RHTTPTransaction& aTrans )
     {
-    // read the header data and check the MIME type here
+    // read the header data and check the MIME type here    
     // check the status and body
     RHTTPResponse response = aTrans.Response();
     TInt status = response.StatusCode();
@@ -512,17 +512,14 @@
                 drmData = CHTTPFilterDRMDataSupplier::NewL( aTrans.Id(),
                     response.Body(), const_cast<CHTTPFilterDRM*> ( this ) );
                 /** Support for Hutchinson's content protection scheme, CFM
-                 *
+                 *  
                  */
                 drmData->SetProcessedContentType( EStandardDRMContent );
                 /**
                  *
                  */
-                CleanupStack::PushL( drmData );
-                iDataSups.AppendL ( drmData );
-                CleanupStack::Pop( drmData );
+                iDataSups.Append( drmData );
                 response.SetBody( *drmData );
-                
 
                 // change the mime type to "application/vnd.oma.drm.content"
                 headers.RemoveField( fieldNameStr );
@@ -569,9 +566,7 @@
                         = CHTTPFilterDRMDataSupplier::NewL( aTrans.Id(),
                             response.Body(),
                             const_cast<CHTTPFilterDRM*> ( this ) );
-                    CleanupStack::PushL( drmData );
-                    iDataSups.AppendL ( drmData );
-                    CleanupStack::Pop( drmData );
+                    iDataSups.Append( drmData );
                     }
 
                 }
@@ -635,7 +630,7 @@
         // Do not encrypt JAD files:
         if ( headers.GetField( fieldNameStr, 0, fieldVal ) == KErrNone )
             {
-            // If it is a JAD always ignore any of the above:
+            // If it is a JAD always ignore any of the above:   
             const TBuf8<sizeof( KJADString )> JADStringBuf( KJADString );
             RStringF JADValue = strP.OpenFStringL( JADStringBuf );
             CleanupClosePushL( JADValue );
@@ -667,13 +662,10 @@
                 User::Leave( KErrUnknown );
                 }
 
-            CleanupStack::PushL( drmData );
-            iDataSups.AppendL ( drmData );
-            CleanupStack::Pop( drmData );
-                
+            iDataSups.Append( drmData );
             response.SetBody( *drmData );
 
-            ///
+            ///         
             RStringF DRMValue1 = strP.OpenFStringL( DRMStringBuf1 );
             CleanupClosePushL( DRMValue1 );