diff -r 958eca8527dd -r 3f7d9dbe57c8 syncmlfw/common/http/src/nsmlhttpclient.cpp --- a/syncmlfw/common/http/src/nsmlhttpclient.cpp Tue Jan 26 12:43:57 2010 +0200 +++ b/syncmlfw/common/http/src/nsmlhttpclient.cpp Tue Feb 02 00:44:00 2010 +0200 @@ -141,32 +141,31 @@ break; } - if(this->iAgent->iSession == ESyncMLDSSession) + if(this->iAgent->iSession == ESyncMLDSSession && this->iAgent->iDeflateFlag ) { - RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType ); - THTTPHdrVal serverContentEncodingValue; - if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound) - { - RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); - const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC(); - if( serverContentEncodingStr == KSmlContentDeflate) - { - this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate; - } - } - - RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType ); - THTTPHdrVal serverAcceptEncodingValue; - if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue ) != KErrNotFound ) - { - RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); - const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC(); - if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound) - { - this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate; - } - } - } + RStringF serverContentEncoding = strPool.OpenFStringL( KSmlContentEncodingType ); + THTTPHdrVal serverContentEncodingValue; + if(hdr.GetField( serverContentEncoding, 0, serverContentEncodingValue ) != KErrNotFound) + { + RStringF fieldServerContentEncodingValStr = strPool.StringF( serverContentEncodingValue.StrF() ); + const TDesC8& serverContentEncodingStr = fieldServerContentEncodingValStr.DesC(); + if( serverContentEncodingStr == KSmlContentDeflate) + { + this->iAgent->iServerContentEncoding = CNSmlHTTP::ExptDeflate; + } + } + RStringF serverAcceptEncoding = strPool.OpenFStringL( KSmlAcceptEncodingType ); + THTTPHdrVal serverAcceptEncodingValue; + if(hdr.GetField( serverAcceptEncoding, 0, serverAcceptEncodingValue ) != KErrNotFound ) + { + RStringF fieldServerAcceptEncodingValStr = strPool.StringF( serverAcceptEncodingValue.StrF() ); + const TDesC8& serverAcceptEncodingStr = fieldServerAcceptEncodingValStr.DesC(); + if( serverAcceptEncodingStr.Find(KSmlContentDeflate) != KErrNotFound) + { + this->iAgent->iServerAcceptEncoding = CNSmlHTTP::ExptDeflate; + } + } + } if ( status == 200 ) {