diff -r 000000000000 -r bde4ae8d615e os/ossrv/genericservices/httputils/inc/Uri8.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/os/ossrv/genericservices/httputils/inc/Uri8.h	Fri Jun 15 03:10:57 2012 +0200
@@ -0,0 +1,208 @@
+// Copyright (c) 2001-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// This file contains the API definition for the classes TUriC8 and 
+// CUri8. These classes provide non-modifying (TUriC8) and modifying
+// (CUri8) functionality for the components of a Uri as described in 
+// RFC2396.
+// 
+//
+
+/**
+ @file Uri8.h
+ @publishedAll
+ @released
+*/
+
+#ifndef __URI8_H__
+#define __URI8_H__
+
+// System includes
+//
+#include <e32base.h>
+#include <f32file.h>
+#include <uricommon.h>
+
+
+/**
+Dependencies : TUriComponent.
+Comments : Provides non-modifying functionality on the components of a uri object as
+defined in RFC2396. There are 5 components; scheme, authority, path, query and fragment.
+
+The	object holds descriptor pointers to the parsed uri components and a descriptor pointer 
+to the uri. It is non-owning. It uses 8-bit descriptors.
+
+The functionality provided by this API allows the uri components to be extracted from the 
+parsed uri, checked for their presence in the uri and be compared with those in another 
+TUriC8 object.
+@publishedAll
+@released
+@since 6.0
+*/
+class TUriC8
+	{
+public:	// Methods
+
+	IMPORT_C HBufC* GetFileNameL() const;
+	IMPORT_C HBufC* GetFileNameL(TUriFileName aType) const;
+
+	IMPORT_C const TDesC8& Extract(TUriComponent aComponent) const;
+	IMPORT_C void UriWithoutFragment(TPtrC8& aUriNoFrag) const;
+
+	IMPORT_C TBool IsPresent(TUriComponent aComponent) const;
+	IMPORT_C TBool IsSchemeValid() const;
+	IMPORT_C TInt Compare(const TUriC8& aUri, TUriComponent aComponent) const;
+
+	IMPORT_C const TDesC8& UriDes() const;
+
+	IMPORT_C TInt Validate() const;
+	IMPORT_C TInt Equivalent(const TUriC8& aUri) const;
+	IMPORT_C HBufC* DisplayFormL(TUriComponent aComponent = EUriComplete) const;
+
+protected:	// Methods
+
+	IMPORT_C TUriC8();
+	void Reset();
+
+protected:	// Attributes
+
+	/** The array of descriptor pointers to the uri components.
+	*/
+	TPtrC8		iComponent[EUriMaxComponents];
+
+	/** The descriptor pointer to the uri.
+	*/
+	TPtrC8		iUriDes;
+
+/**
+	A friend class.
+	@see		CUri8 
+	@since		6.0
+ */
+	friend class CUri8;
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+/**
+	A friend class used for testing.
+	@see		TUriC8StateAccessor
+	@since		6.0	
+ */
+#else
+/**
+	A friend class used for testing.
+	@see		TUriC8StateAccessor
+	@since		6.0
+	@internalComponent
+ */
+#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
+	friend class TUriC8StateAccessor;
+
+	};
+
+/**
+Dependencies : TUriC8
+Comments : Provides functionality to parse a descriptor into the components of a uri as 
+defined in RFC2396. There are 5 components; scheme, authority, path, query and fragment.
+
+It uses 8-bit descriptors.
+
+Format of a uri is; scheme://authority path?query\#fragment
+
+@warning The descriptor that is parsed by an object of this class will be referenced 
+by that object. If the original descriptor is no longer in scope there will be undefined 
+behaviour.
+@publishedAll
+@released
+@since 6.0
+*/
+class TUriParser8 : public TUriC8
+	{
+public:	// Methods
+
+	IMPORT_C TUriParser8();
+
+	IMPORT_C TInt Parse(const TDesC8& aUri);
+
+private:	// Methods	
+	void RetrieveScheme(const TPtrC8& aUri, TPtrC8& aScheme);
+	};
+
+class CUri8 : public CBase
+/**
+Dependencies : CBase, TUriC8.
+Comments : Provides modifying functionality on the components of a uri object, as
+defined in RFC2396. There are 5 components; scheme. authority, path, query and fragment.
+
+The	object holds parsed uri information. It is owning. It uses 8-bit descriptors.
+
+The functionality provided by this API allows the uri components to be set or removed 
+from this parsed uri. Also, it provides a reference to TUriC8 object so that the non-modifying 
+functionality can be used.
+@publishedAll
+@released
+@since 6.0
+*/
+	{
+public: // Methods
+
+	IMPORT_C static CUri8* CreateFileUriL(const TDesC& aFullFileName, TUint aFlags = 0); 
+	IMPORT_C static CUri8* CreatePrivateFileUriL(const TDesC& aRelativeFileName, TDriveNumber aDrive, TInt aFlags = 0);
+	
+	IMPORT_C static CUri8* NewL(const TUriC8& aUri);
+	IMPORT_C static CUri8* NewLC(const TUriC8& aUri);
+	IMPORT_C static CUri8* NewL();
+	IMPORT_C static CUri8* NewLC();
+
+	IMPORT_C static CUri8* ResolveL(const TUriC8& aBaseUri, const TUriC8& aRefUri);
+
+	IMPORT_C ~CUri8();
+
+	IMPORT_C const TUriC8& Uri() const;
+	IMPORT_C void SetComponentL(const TDesC8& aData, TUriComponent aComponent);
+	IMPORT_C void RemoveComponentL(TUriComponent aComponent);
+
+private:	// Methods
+
+	CUri8(const TUriC8& aNewUri);
+	void ConstructL();
+	void FormUriL();
+	void InitializeFileUriComponentsL(const TDesC& aFileName, TDriveNumber aDrive, TUint aFlags);
+
+private:	// Attributes
+
+	/** The descriptor buffer that contains the uri.
+	 */
+	HBufC8*	iUriBuf;
+
+	/** The parsed uri object.
+	 */
+	TUriC8	iUri;
+	
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+/**
+	A friend class used for testing.
+	@see		TUri8StateAccessor
+	@since		6.0
+	*/
+#else
+/**
+	A friend class used for testing.
+	@see		TUri8StateAccessor
+	@since		6.0
+	@internalComponent
+ */
+#endif	//SYMBIAN_ENABLE_SPLIT_HEADERS
+	friend class TUri8StateAccessor;
+
+	};
+
+#endif	// __URI8_H__