1.1 --- a/epoc32/include/mw/http/rhttptransaction.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/mw/http/rhttptransaction.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 RHTTPTransaction.h
1.23 + @file
1.24 @warning : This file contains Rose Model ID comments - please do not delete
1.25 */
1.26
1.27 @@ -67,7 +65,8 @@
1.28 //##ModelId=3C4C188600ED
1.29 IMPORT_C void SubmitL(THTTPFilterHandle aStart =
1.30 THTTPFilterHandle::EClient);
1.31 -
1.32 +
1.33 + IMPORT_C TInt Submit(THTTPFilterHandle aStart = THTTPFilterHandle::EClient);
1.34 /** Notify HTTP of the availability of more request body data,
1.35 when submitting body data in several parts.
1.36
1.37 @@ -89,7 +88,8 @@
1.38 IMPORT_C void SendEventL(THTTPEvent aStatus,
1.39 THTTPEvent::TDirection aDirection,
1.40 THTTPFilterHandle aStart);
1.41 -
1.42 +
1.43 + IMPORT_C TInt SendEvent(THTTPEvent aStatus, THTTPEvent::TDirection aDirection, THTTPFilterHandle aStart);
1.44 /** Gets the response. Note that the returned response may not be
1.45 valid if it hasn't been created yet.
1.46 @see RHTTPMessage::IsValid()
1.47 @@ -97,11 +97,11 @@
1.48 //##ModelId=3C4C188600E1
1.49 IMPORT_C RHTTPResponse Response() const;
1.50
1.51 - /// Gets the request.
1.52 + // Gets the request.
1.53 //##ModelId=3C4C188600DA
1.54 IMPORT_C RHTTPRequest Request() const;
1.55
1.56 - /// Returns the session associated with the transaction.
1.57 + // Returns the session associated with the transaction.
1.58 //##ModelId=3C4C188600D9
1.59 IMPORT_C RHTTPSession Session() const;
1.60
1.61 @@ -171,6 +171,16 @@
1.62 //##ModelId=3C4C188600B9
1.63 IMPORT_C TInt ServerCert(TCertInfo& aServerCert);
1.64
1.65 +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
1.66 + /** Obtain the server certificate information for this transaction. This function
1.67 + should only be used for HTTP. WSP should use RHttpSession::ServerCert.
1.68 + @see RHttpSession::ServerCert
1.69 + @prototype
1.70 + @return a CCertificate pointer to an CX509Certificate object.
1.71 + Calling code can safely cast to CX509Certificate if using "HTTP/TCP".
1.72 + NULL returned if certificate information not found.
1.73 + */
1.74 +#else
1.75 /** Obtain the server certificate information for this transaction. This function
1.76 should only be used for HTTP. WSP should use RHttpSession::ServerCert.
1.77 @see RHttpSession::ServerCert
1.78 @@ -180,28 +190,44 @@
1.79 Calling code can safely cast to CX509Certificate if using "HTTP/TCP".
1.80 NULL returned if certificate information not found.
1.81 */
1.82 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.83 IMPORT_C const CCertificate* ServerCert();
1.84 -
1.85 +
1.86 +
1.87 /** Obtain the cipher suite information for this transaction.
1.88 @return RString containing the cipher suite as per RFC2246.
1.89 */
1.90 IMPORT_C RString CipherSuite();
1.91 -
1.92 +
1.93 +#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
1.94 + /**Sets the HTTP data optimiser for the transaction.
1.95 + @param aHttpOptimiser An object of the implementation of interface, MHttpDataOptimiser, supplied by the client.
1.96 + */
1.97 +#else
1.98 /**Sets the HTTP data optimiser for the transaction.
1.99 @param aHttpOptimiser An object of the implementation of interface, MHttpDataOptimiser, supplied by the client.
1.100 @publishedPartner
1.101 + @released
1.102 */
1.103 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.104 IMPORT_C void SetupHttpDataOptimiser (MHttpDataOptimiser& aHttpOptimiser);
1.105
1.106 + #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
1.107 + /**Returns the object of the MHttpDataOptimiser implementation class.
1.108 + */
1.109 +#else
1.110 /**Returns the object of the MHttpDataOptimiser implementation class.
1.111 @internalTechnology
1.112 */
1.113 +#endif //SYMBIAN_ENABLE_SPLIT_HEADERS
1.114 IMPORT_C MHttpDataOptimiser* HttpDataOptimiser ();
1.115
1.116 private:
1.117 friend class RHTTPSession;
1.118 friend class CTransaction;
1.119 -
1.120 + friend class CProtocolHandler;
1.121 +
1.122 + inline CTransaction* Implementation();
1.123 private:
1.124 //##ModelId=3C4C188600A7
1.125 CTransaction* iImplementation;
1.126 @@ -221,5 +247,9 @@
1.127 {
1.128 }
1.129
1.130 +inline CTransaction* RHTTPTransaction::Implementation()
1.131 + {
1.132 + return iImplementation;
1.133 + }
1.134
1.135 #endif // __RHTTPTRANSACTION_H__