--- a/applayerprotocols/httpservice/src/chttpservice.cpp	Thu Aug 19 10:27:19 2010 +0300
+++ b/applayerprotocols/httpservice/src/chttpservice.cpp	Tue Aug 31 15:44:10 2010 +0300
@@ -24,8 +24,6 @@
 /**
  * The default 2-phase constructor to create a CHttpService instance
  * 
- * @publishedAll
- * @prototype 
  */
 EXPORT_C CHttpService* CHttpService::NewL()
 	{
@@ -37,8 +35,6 @@
 	}
 /**
  * Destructor
- * @publishedAll
- * @prototype 
  */	
 
 EXPORT_C CHttpService::~CHttpService()
@@ -52,8 +48,6 @@
 
 /**
  * Destructor of the inner class CHttpServiceStruct
- * @publishedAll
- * @prototype 
  */ 
 CHttpService::CHttpServiceStruct::~CHttpServiceStruct()
     {
@@ -69,18 +63,13 @@
  * 
  * @return KErrNotFound if the string ID is not found in the HTTP string pool
  *          otherwise KErrNone for success
- *
- * @publishedAll
- * @prototype 
  */
-
 EXPORT_C TInt CHttpService::String(TInt aStringId, TPtrC8& aPtr)
     {
     RStringF str = iHttpServiceStruct->iHttpSession.StringPool().StringF(aStringId, RHTTPSession::GetTable());
     aPtr.Set(str.DesC());
     return KErrNone;
     }
-
 /**
  * Set the proxy that applies to all HTTP client transactions that "this"
  * CHttpService instance creates
@@ -117,8 +106,6 @@
  * @return Proxy address otherwise KNullDesC8 if the proxy information
  *         is not set.
  * 
- * @publishedAll
- * @prototype 
  */
 
 EXPORT_C const TDesC8& CHttpService::ProxyAddress() const
@@ -143,9 +130,6 @@
  * at any time. The default no. of connections that the CHttpService instance uses is 6.
  * 
  * @param aValue aValue No. of connections
- * 
- * @publishedAll
- * @prototype 
  */
 
 EXPORT_C void CHttpService::SetMaxConnections(TInt aValue)
@@ -160,8 +144,6 @@
 /**
  * Returns the maximum no. of TCP connections that is set.
  * 
- * @publishedAll
- * @prototype 
  */
 
 EXPORT_C TInt CHttpService::MaxConnections() const
@@ -179,13 +161,6 @@
 	}
 	
 
-/**
- * Sets the maximum number of transactions to be pipelined.
- * @param aValue - number of transactions
- *
- * @publishedAll
- * @prototype 
- */ 
 EXPORT_C void CHttpService::SetMaxTransactionsToPipeline(TInt aValue)
 	{
 	RHTTPSession sess = iHttpServiceStruct->iHttpSession;
@@ -195,12 +170,6 @@
 	connInfo.SetProperty(sp.StringF(HTTP::EMaxNumTransactionsToPipeline, RHTTPSession::GetTable()), THTTPHdrVal(aValue));				
 	}
 	
-/**
- * Returns the maximum number of transactions to be pipelined.
- * 
- * @publishedAll
- * @prototype 
- */ 
 EXPORT_C TInt CHttpService::MaxTransactionsToPipeline() const
 	{
 	RHTTPSession sess = iHttpServiceStruct->iHttpSession;
@@ -220,10 +189,7 @@
  * for all HTTP client transactions. [For ex; User-Agent header] 
  * 
  * @param aStringId - Pre-defined String ID in the HTTP string pool
- * @param aHeaderValue - Value for the header
- *  
- * @publishedAll
- * @prototype 
+ * @param aHeaderValue - Value for the header 
  */
 EXPORT_C TInt CHttpService::AddRequestHeader(TInt aStringId, const THttpHeaderValueVariant& aHeaderValue)
 	{
@@ -240,10 +206,7 @@
  * applicable for all HTTP client transactions. [For ex; User-Agent header] 
  * 
  * @param aHeaderName - Custom header name
- * @param aHeaderValue - Value for the header
- *  
- * @publishedAll
- * @prototype 
+ * @param aHeaderValue - Value for the header 
  */
 EXPORT_C TInt CHttpService::AddCustomRequestHeader(const TDesC8& aHeaderName, const TDesC8& aHeaderValue)
 	{
@@ -259,14 +222,6 @@
 	return err;
 	}
 
-/**
- * This method facilitates to set to construct the authentication credentials to be passed by the application
- * The derived class from MHTTPServiceAuthentication  will be called from the framework, if authentication is required.
- * @param aCallback - Derived class from MHTTPServiceAuthentication
- *
- * @publishedAll
- * @prototype 
- */
 EXPORT_C TInt CHttpService::SetAuthentication(MHTTPServiceAuthentication* aCallback)
     {
     TInt error = KErrGeneral;
@@ -293,49 +248,9 @@
     SetMaxTransactionsToPipeline(KMaxTransToPipeline);    
 	}
 	
-/**
- * returns the CHttpNetworkConnection instance created by the framework.
- * The class can be used to set the connection properties.
- *
- * @publishedAll
- * @prototype 
- */
 EXPORT_C CHttpNetworkConnection* CHttpService::HttpNetworkConnection()
     {
     CHttpNetworkConnection *httpNetworkConn = CHttpNetworkConnection::New();
     httpNetworkConn->SetHttpService(this);
     return httpNetworkConn;
     }
-
-void CHttpService::RemoveUnwantedFilters()
-    {
-    THTTPFilterRegistration filterInfo;
-    RStringPool stringPool = iHttpServiceStruct->iHttpSession.StringPool();
-
-    RHTTPFilterCollection filterArray = iHttpServiceStruct->iHttpSession.FilterCollection();
-    THTTPFilterIterator iter = filterArray.Query();
-    const TStringTable& st = RHTTPSession::GetTable();
-  
-    iter.First();
-
-    while (!iter.AtEnd())
-        {
-        // Get next filter registration info
-        filterInfo = iter();
-        RStringF filterName = stringPool.StringF(filterInfo.iName);
-        switch(filterName.Index(st))
-            {
-            //dont remove these filters
-            case HTTP::EClient:
-            case HTTP::EProtocolHandler:
-            case HTTP::EValidation:
-            case HTTP::ERedirect:
-            case HTTP::EHttpConnectFilter:
-                break;
-            //anything other than above, remove.    
-            default:
-                filterArray.RemoveFilter(filterName);
-             }
-        ++iter;
-        }
-    }