Merge branch 'release/debian/2.0.3-1'HEADdebian/2.0.3-1master

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/icap/header.cpp b/lib/icap/header.cpp
index 493e659..ca72bc8 100644
--- a/lib/icap/header.cpp
+++ b/lib/icap/header.cpp
@@ -140,20 +140,17 @@ namespace icap {
 		*   OPTIONS response encapsulated_list: optbody
 		*/
 
-		Header::encapsulated_header_index_t idx;
 		std::string encaps_header = "";
 
-		// FIXME: chances are that we will always get the correct order
-		//        but should consider sorting
-		for ( idx = _encapsulated.begin(); idx != _encapsulated.end(); idx++ ) {
+		for ( auto& idx : sort_encapsulated_header() ) {
 
-			if ( idx->second > 0 ) {
+			if ( idx.second >= 0 ) {
 
 				if ( encaps_header != "" ) {
 					encaps_header.append( ", " );
 				}
 
-				encaps_header.append( idx->first ).append( "=" ).append( util::itoa( idx->second ) );
+				encaps_header.append( idx.first ).append( "=" ).append( util::itoa( idx.second ) );
 
 			}