# HG changeset patch # User William Roberts # Date 1275053175 -3600 # Node ID 7cd994b812ca26398c4e858717827c36e135d2b6 # Parent 3a7375419266ebdc3390b0e3f3a08005cfb83270# Parent bc49e59e6c8b0d7e9ccb7acd8ee8bb9537fb3d53 Re-merge fix for bug 2109 diff -r bc49e59e6c8b -r 7cd994b812ca compressionlibs/ziplib/group/libz/libz.mmp --- a/compressionlibs/ziplib/group/libz/libz.mmp Tue May 18 17:05:24 2010 +0100 +++ b/compressionlibs/ziplib/group/libz/libz.mmp Fri May 28 14:26:15 2010 +0100 @@ -54,3 +54,4 @@ MACRO __wchar_t_defined #endif //GCCXML SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca compressionlibs/ziplib/group/libz/libzcore.mmp --- a/compressionlibs/ziplib/group/libz/libzcore.mmp Tue May 18 17:05:24 2010 +0100 +++ b/compressionlibs/ziplib/group/libz/libzcore.mmp Fri May 28 14:26:15 2010 +0100 @@ -53,3 +53,4 @@ DEFFILE ../../~/libzcore.def SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/cppstdlib/group/libstdcpp.mmp --- a/genericopenlibs/cppstdlib/group/libstdcpp.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/cppstdlib/group/libstdcpp.mmp Fri May 28 14:26:15 2010 +0100 @@ -347,3 +347,4 @@ /* End of file */ SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/backend/group/StdioServer.mmp --- a/genericopenlibs/openenvcore/backend/group/StdioServer.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/backend/group/StdioServer.mmp Fri May 28 14:26:15 2010 +0100 @@ -54,3 +54,4 @@ SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/backend/group/backend.mmp --- a/genericopenlibs/openenvcore/backend/group/backend.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/backend/group/backend.mmp Fri May 28 14:26:15 2010 +0100 @@ -156,6 +156,7 @@ #endif +PAGED // End of File diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/backend/group/signalserver.mmp --- a/genericopenlibs/openenvcore/backend/group/signalserver.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/backend/group/signalserver.mmp Fri May 28 14:26:15 2010 +0100 @@ -46,3 +46,4 @@ SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp --- a/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Fri May 28 14:26:15 2010 +0100 @@ -66,3 +66,4 @@ SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/libc/group/libc.mmp --- a/genericopenlibs/openenvcore/libc/group/libc.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/libc/group/libc.mmp Fri May 28 14:26:15 2010 +0100 @@ -286,5 +286,6 @@ +PAGED // End of File SMPSAFE diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/libdl/group/libdl.mmp --- a/genericopenlibs/openenvcore/libdl/group/libdl.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/libdl/group/libdl.mmp Fri May 28 14:26:15 2010 +0100 @@ -72,3 +72,4 @@ SMPSAFE +PAGED diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/libm/group/libm.mmp --- a/genericopenlibs/openenvcore/libm/group/libm.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/libm/group/libm.mmp Fri May 28 14:26:15 2010 +0100 @@ -216,6 +216,7 @@ #ifdef WINSCW LIBRARY ewsd.lib #endif +PAGED // End of File SMPSAFE diff -r bc49e59e6c8b -r 7cd994b812ca genericopenlibs/openenvcore/libpthread/group/libpthread.mmp --- a/genericopenlibs/openenvcore/libpthread/group/libpthread.mmp Tue May 18 17:05:24 2010 +0100 +++ b/genericopenlibs/openenvcore/libpthread/group/libpthread.mmp Fri May 28 14:26:15 2010 +0100 @@ -131,6 +131,7 @@ LIBRARY backend.lib +PAGED // End of File #ifdef WINSCW diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/Authentication/TConvBase64.cpp --- a/genericservices/httputils/Authentication/TConvBase64.cpp Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/Authentication/TConvBase64.cpp Fri May 28 14:26:15 2010 +0100 @@ -174,3 +174,86 @@ return maskShift>maskShift)&ESixBitMask)]; + + *destStringPtr++=encodedChar; + destStringCharNum++; + + // Add a CRLF every aLineLength number of characters + if (destStringCharNum == aLineLength) + { + destStringCharNum = 0; + *destStringPtr++ = '\r'; + *destStringPtr++ = '\n'; + } + } + + // Check for not enough chars and pad if required + if (maskShift==EFour) + { + *destStringPtr++=KImcvConvEquals; + *destStringPtr++=KImcvConvEquals; + } + else + if(maskShift==ESix) + *destStringPtr++=KImcvConvEquals; + + aDestString.SetLength((TInt)(destStringPtr-destStringPtrBase)); + return ((TInt)(srcStringPtr-srcStringEnd)); + } diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/UriParser/GenericUriParser.cpp --- a/genericservices/httputils/UriParser/GenericUriParser.cpp Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/UriParser/GenericUriParser.cpp Fri May 28 14:26:15 2010 +0100 @@ -169,6 +169,11 @@ } else { + + // First, move past the opening brace + authority.Set(authority.Mid(startHostIPv6 + 1)); + // auth now = X:X:X]????? + // This is an IPv6 address, so it MUST have the closing brace too.... TInt endIPv6Host = authority.Locate(KIPv6UriCloseBrace); @@ -182,16 +187,13 @@ // It's an ipv6 address, with an opening and closing brace. So now just extract it // auth = [X:X:X]????? - // First, move past the opening brace - authority.Set(authority.Mid(startHostIPv6 + 1)); - // auth now = X:X:X]????? // Set the host, and need to remove the closing brace - aHost.Set(authority.Left(endIPv6Host - 1)); + aHost.Set(authority.Left(endIPv6Host)); // host = X:X:X // Move past the host - authority.Set(authority.Mid(endIPv6Host)); + authority.Set(authority.Mid(endIPv6Host + 1)); } // Get the port... diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/UriParser/SipUriParser.cpp --- a/genericservices/httputils/UriParser/SipUriParser.cpp Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/UriParser/SipUriParser.cpp Fri May 28 14:26:15 2010 +0100 @@ -168,6 +168,10 @@ } else { + // First, move past the opening brace + authority.Set(authority.Mid(startHostIPv6 + 1)); + // auth now = X:X:X]????? + // This is an IPv6 address, so it MUST have the closing brace too.... TInt endIPv6Host = authority.Locate(KIPv6UriCloseBrace); @@ -181,16 +185,13 @@ // It's an ipv6 address, with an opening and closing brace. So now just extract it // auth = [X:X:X]????? - // First, move past the opening brace - authority.Set(authority.Mid(startHostIPv6 + 1)); - // auth now = X:X:X]????? // Set the host, and need to remove the closing brace - aHost.Set(authority.Left(endIPv6Host - 1)); + aHost.Set(authority.Left(endIPv6Host)); // host = X:X:X // Move past the host - authority.Set(authority.Mid(endIPv6Host)); + authority.Set(authority.Mid(endIPv6Host + 1 )); } // Get the port... diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/UriParser/TUriParser.cpp --- a/genericservices/httputils/UriParser/TUriParser.cpp Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/UriParser/TUriParser.cpp Fri May 28 14:26:15 2010 +0100 @@ -324,6 +324,11 @@ } else { + + // First, move past the opening brace + authority.Set(authority.Mid(startHostIPv6 + 1)); + // auth now = X:X:X]????? + // This is an IPv6 address, so it MUST have the closing brace too.... TInt endIPv6Host = authority.Locate(KIPv6UriCloseBrace); @@ -334,16 +339,13 @@ // It's an ipv6 address, with an opening and closing brace. So now just extract it // auth = [X:X:X]????? - // First, move past the opening brace - authority.Set(authority.Mid(startHostIPv6 + 1)); - // auth now = X:X:X]????? // Set the host, and need to remove the closing brace - aHost.Set(authority.Left(endIPv6Host -1)); + aHost.Set(authority.Left(endIPv6Host)); // host = X:X:X // Move past the host - authority.Set(authority.Mid(endIPv6Host)); + authority.Set(authority.Mid(endIPv6Host + 1 )); } // Get the port... diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/bwins/INETPROTUTILU.DEF --- a/genericservices/httputils/bwins/INETPROTUTILU.DEF Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/bwins/INETPROTUTILU.DEF Fri May 28 14:26:15 2010 +0100 @@ -290,4 +290,5 @@ ?DummyForwardingFunctionForCompatibility@EscapeUtils@@CAPAVHBufC8@@ABVTDesC8@@0@Z @ 289 NONAME ; class HBufC8 * EscapeUtils::DummyForwardingFunctionForCompatibility(class TDesC8 const &, class TDesC8 const &) ??0TBase64@@QAE@XZ @ 290 NONAME ; TBase64::TBase64(void) ?NormaliseUriL@UriUtils@@SAPAVCUri8@@ABVTUriC8@@@Z @ 291 NONAME ; class CUri8 * UriUtils::NormaliseUriL(class TUriC8 const &) + ?PortableEncode@TBase64@@QAEHABVTDesC8@@AAVTDes8@@H@Z @ 292 NONAME ; int TBase64::PortableEncode(class TDesC8 const &, class TDes8 &, int) diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/eabi/InetProtUtilU.Def --- a/genericservices/httputils/eabi/InetProtUtilU.Def Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/eabi/InetProtUtilU.Def Fri May 28 14:26:15 2010 +0100 @@ -377,4 +377,5 @@ _ZTV17CGenericUriParser @ 376 NONAME _ZN7TBase646DecodeERK6TDesC8R5TDes8 @ 377 NONAME _ZN8UriUtils13NormaliseUriLERK6TUriC8 @ 378 NONAME + _ZN7TBase6414PortableEncodeERK6TDesC8R5TDes8i @ 379 NONAME \ No newline at end of file diff -r bc49e59e6c8b -r 7cd994b812ca genericservices/httputils/inc/TConvBase64.h --- a/genericservices/httputils/inc/TConvBase64.h Tue May 18 17:05:24 2010 +0100 +++ b/genericservices/httputils/inc/TConvBase64.h Fri May 28 14:26:15 2010 +0100 @@ -56,7 +56,7 @@ }; /** -Base64 encoding and decoding class, complaint with RFC-3548. +Base64 encoding and decoding class. @internalAll @released */ @@ -102,7 +102,7 @@ IMPORT_C TBase64(); IMPORT_C TInt Encode( const TDesC8& aSrcString, TDes8& rDestString); IMPORT_C TBool Decode( const TDesC8& aSrcString, TDes8& rDestString); - + IMPORT_C TInt PortableEncode(const TDesC8& aSrcString, TDes8& aDestString, TInt aLineLength=-1); private: TInt iShiftStored; diff -r bc49e59e6c8b -r 7cd994b812ca ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h --- a/ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h Tue May 18 17:05:24 2010 +0100 +++ b/ossrv_pub/compiler_specific_runtime_support/inc/stdapis/stlport/runtime/new.h Fri May 28 14:26:15 2010 +0100 @@ -15,6 +15,9 @@ * */ +#ifndef _STLP_NEW_H +#define _STLP_NEW_H + # if !defined (_STLP_OUTERMOST_HEADER_ID) # define _STLP_OUTERMOST_HEADER_ID 0x848 # include @@ -22,11 +25,7 @@ # define _STLP_DONT_POP_0x848 # endif -#ifndef _STLP_NEW_H -#define _STLP_NEW_H - - -# if (!(defined( _STLP_WINCE ) || defined (__SYMBIAN32__)) +# if (!(defined( _STLP_WINCE ) || defined (__SYMBIAN32__))) # if defined (__BORLANDC__) # include # elif (__INTEL_COMPILER >= 800) @@ -40,8 +39,6 @@ # endif # endif /* STL_WINCE */ -#endif //_STLP_NEW_H - # if (_STLP_OUTERMOST_HEADER_ID == 0x848) # if ! defined (_STLP_DONT_POP_0x848) # include @@ -50,6 +47,8 @@ # undef _STLP_DONT_POP_0x848 # endif +#endif //_STLP_NEW_H + // Local Variables: // mode:C++ // End: