1.1 --- a/epoc32/include/mw/http/rhttpsession.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/http/rhttpsession.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -13,10 +13,8 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22 - @file RHTTPSession.h
    1.23 + @file
    1.24   @warning : This file contains Rose Model ID comments - please do not delete
    1.25  */
    1.26  
    1.27 @@ -216,7 +214,16 @@
    1.28  	//##ModelId=3C4C187B02AA
    1.29  	IMPORT_C TInt ServerCert(TCertInfo& aServerCert);
    1.30  
    1.31 -
    1.32 +	#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.33 +	/** Obtain the server certificate information for this session.  This function
    1.34 +		should only be used for WSP. HTTP should use RHttpTransaction::ServerCert.
    1.35 +		@see RHttpSession::ServerCert
    1.36 +		@prototype
    1.37 +		@return	a CCertificate pointer to an CWTLSCertificate object.
    1.38 +		Calling code can safely cast to CWTLSCertificate if using  "WSP/WSP".
    1.39 +		NULL returned if certificate information not found.
    1.40 +	*/
    1.41 +	#else
    1.42  	/** Obtain the server certificate information for this session.  This function
    1.43  		should only be used for WSP. HTTP should use RHttpTransaction::ServerCert.
    1.44  		@see RHttpSession::ServerCert
    1.45 @@ -226,7 +233,8 @@
    1.46  		Calling code can safely cast to CWTLSCertificate if using  "WSP/WSP".
    1.47  		NULL returned if certificate information not found.
    1.48  	*/
    1.49 -	IMPORT_C const CCertificate* RHTTPSession::ServerCert();
    1.50 +	#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.51 +	IMPORT_C const CCertificate* ServerCert();
    1.52  
    1.53  	/** Connect this WSP session. This function does nothing when called for text-mode.
    1.54  	*/
    1.55 @@ -237,22 +245,37 @@
    1.56  	*/
    1.57  	//##ModelId=3C4C187B02A8
    1.58  	IMPORT_C void DisconnectL();
    1.59 -	
    1.60 +
    1.61 +	#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.62  	/**Set the default Proxy for Http Session. This function reads default proxy information,if available, from CommsDat
    1.63  	and uses it for the current Session.
    1.64  	@internalAll
    1.65  	*/
    1.66  	IMPORT_C void SetupDefaultProxyFromCommsDatL();
    1.67  
    1.68 +	#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.69 +
    1.70 +	#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS	
    1.71 +	/**Sets the HTTP data optimiser for the session.
    1.72 +	@param aHttpOptimiser An object of the implementation of interface, MHttpDataOptimiser, supplied by the client.
    1.73 +	*/
    1.74 +	#else
    1.75  	/**Sets the HTTP data optimiser for the session.
    1.76  	@param aHttpOptimiser An object of the implementation of interface, MHttpDataOptimiser, supplied by the client.
    1.77  	@publishedPartner
    1.78 +	@released
    1.79  	*/
    1.80 +	#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.81  	IMPORT_C void SetupHttpDataOptimiser (MHttpDataOptimiser& aHttpOptimiser);
    1.82 - 
    1.83 + 	
    1.84 +	#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS	
    1.85 + 	/**Returns the object of the MHttpDataOptimiser implementation class.
    1.86 +	*/
    1.87 +	#else
    1.88   	/**Returns the object of the MHttpDataOptimiser implementation class.
    1.89  	@internalTechnology
    1.90  	*/
    1.91 +	#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
    1.92   	IMPORT_C MHttpDataOptimiser* HttpDataOptimiser ();
    1.93  
    1.94  private: