20 files changed, 57 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml
index b3dd807..c04a319 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,6 @@ language: cpp
 
 sudo: false
 
-addons:
-  apt:
-    packages:
-      - liblog4cpp5-dev
-
 compiler:
   - gcc
   - clang
@@ -14,7 +9,7 @@ compiler:
 before_install:
   - echo $LANG
   - echo $LC_ALL
-  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install libconfig log4cpp; fi
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install libconfig; fi
 
 install:
   - curl -L https://github.com/nukedzn/psocksxx/releases/download/v1.1.1/psocksxx-1.1.1.tar.gz | tar -zx -C /tmp
diff --git a/changelog b/changelog
index 62f726d..e773e5f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+2.0.3 - 27th December 2018
+	* Fix encapsulated header data in icap responses (issue #12)
+
+2.0.2 - 25th December 2018
+	* Fix modules to return valid icap responses (issue #10)
+
 2.0.1 - 11th July 2018
 	*   Fix spelling mistakes
 
diff --git a/configure.ac b/configure.ac
index c594e34..a374c48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([bitz-server], [2.0.1], [https://github.com/uditha-atukorala/bitz-server/issues])
+AC_INIT([bitz-server], [2.0.3], [https://github.com/uditha-atukorala/bitz-server/issues])
 AC_CONFIG_AUX_DIR([aux-build])
 AC_CONFIG_MACRO_DIR([aux-build/m4])
 AC_CONFIG_HEADERS([include/config.h])
diff --git a/debian/changelog b/debian/changelog
index aced019..7911b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+bitz-server (2.0.3-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Refresh symbols files.
+  * Declare compliance with Debian Policy 4.3.0.1 (No changes needed).
+  * debian/copyright:
+    - Bump years to 2019.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 12 Jan 2019 16:57:03 +0100
+
 bitz-server (2.0.1-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 7a631d0..c230799 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libpython-dev
 Build-Depends-Indep:
  doxygen
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0.1
 Homepage: https://github.com/uditha-atukorala/bitz-server
 Vcs-Git: git://jff.email/opt/git/bitz-server.git
 Vcs-Browser: https://jff.email/cgit/bitz-server.git/
diff --git a/debian/copyright b/debian/copyright
index b78aa13..898d567 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,7 +28,7 @@ Copyright: 2017      Alexander Dalshov
 License: MIT
 
 Files: debian/*
-Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email>
+Copyright: 2014-2019 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/libicap1.symbols.alpha b/debian/libicap1.symbols.alpha
index 1bf26b8..43712e9 100644
--- a/debian/libicap1.symbols.alpha
+++ b/debian/libicap1.symbols.alpha
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.amd64 b/debian/libicap1.symbols.amd64
index 4128eba..bce0543 100644
--- a/debian/libicap1.symbols.amd64
+++ b/debian/libicap1.symbols.amd64
@@ -27,7 +27,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.arm64 b/debian/libicap1.symbols.arm64
index 0f97986..7d42e8e 100644
--- a/debian/libicap1.symbols.arm64
+++ b/debian/libicap1.symbols.arm64
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.i386 b/debian/libicap1.symbols.i386
index c9aed61..6b51d9e 100644
--- a/debian/libicap1.symbols.i386
+++ b/debian/libicap1.symbols.i386
@@ -1,4 +1,20 @@
 libicap.so.1 libicap1 #MINVER#
+ _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiESt6vectorIS9_SaIS9_EEEENS0_5__ops15_Iter_comp_iterIN4icap6Header27encapsulated_header_compareEEEEvT_SL_T0_@Base 2.0.3
+ _ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiESt6vectorIS9_SaIS9_EEEEiNS0_5__ops15_Iter_comp_iterIN4icap6Header27encapsulated_header_compareEEEEvT_SL_T0_T1_@Base 2.0.3
+ _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPSt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiESt6vectorIS9_SaIS9_EEEENS0_5__ops14_Val_comp_iterIN4icap6Header27encapsulated_header_compareEEEEvT_T0_@Base 2.0.3
+ (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>&)@Base" 2.0.3
+ (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base" 2.0.3
+ (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"" 2.0.3
+ (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"" 2.0.3
+ (c++)"void std::__unguarded_linear_insert<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Val_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Val_comp_iter<icap::Header::encapsulated_header_compare>)@Base"" 2.0.3
+ (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>&)@Base""" 2.0.3
+ (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base""" 2.0.3
+ (c++)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char const*>(char const*, char const*, std::forward_iterator_tag)@Base" 2.0.3
+ (c++)"void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag)@Base" 2.0.3
+ (c++)"std::_Rb_tree_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::_M_emplace_hint_unique<std::piecewise_construct_t const&, std::tuple<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>, std::tuple<> >(std::_Rb_tree_const_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::piecewise_construct_t const&, std::tuple<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&>&&, std::tuple<>&&)@Base" 2.0.3
+ (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"""" 2.0.3
+ (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"""" 2.0.3
+ (c++)"void std::__unguarded_linear_insert<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Val_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Val_comp_iter<icap::Header::encapsulated_header_compare>)@Base""" 2.0.3
  (c++)"icap::RequestHeader::read_header(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0
  (c++)"icap::RequestHeader::RequestHeader(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0
  (c++)"icap::RequestHeader::RequestHeader(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0
@@ -49,8 +65,8 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::Header::remove(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >)@Base" 1.0.0
  (c++)"void std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >::_M_realloc_insert<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >(__gnu_cxx::__normal_iterator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >*, std::vector<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&&)@Base" 1.0.0
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::operator=(std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 1.0.0
- (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>&)@Base" 1.0.0
- (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base" 1.0.0
+ (c++)"void std::__make_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>&)@Base"""" 1.0.0
+ (c++)"void std::__adjust_heap<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, int, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base""" 1.0.0
  (c++)"icap::Header::Header()@Base" 1.0.0
  (c++)"icap::Header::Header()@Base" 1.0.0
  (c++)"icap::Header::~Header()@Base" 1.0.0
@@ -102,8 +118,8 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> > >::_M_get_insert_unique_pos(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> > >::find(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 1.0.0
  (c++)"std::_Rb_tree<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int>, std::_Select1st<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> >, std::less<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> > >::_M_erase(std::_Rb_tree_node<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const, int> >*)@Base" 1.0.0
- (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"" 1.0.0
- (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, __gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, __gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"" 1.0.0
+ (c++)"void std::__insertion_sort<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"""" 1.0.0
+ (c++)"void std::__introsort_loop<__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare> >(__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, (c++)"__gnu_cxx::__normal_iterator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>*, std::vector<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int>, std::allocator<std::pair<std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, int> > > >, int, (c++)"__gnu_cxx::__ops::_Iter_comp_iter<icap::Header::encapsulated_header_compare>)@Base"""" 1.0.0
  (c++)"typeinfo for icap::RequestHeader@Base" 1.0.0
  (c++)"typeinfo for icap::ResponseHeader@Base" 1.0.0
  (c++)"typeinfo for icap::Header@Base" 1.0.0
diff --git a/debian/libicap1.symbols.kfreebsd-amd64 b/debian/libicap1.symbols.kfreebsd-amd64
index 009d305..a022e35 100644
--- a/debian/libicap1.symbols.kfreebsd-amd64
+++ b/debian/libicap1.symbols.kfreebsd-amd64
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::rtrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.mips64el b/debian/libicap1.symbols.mips64el
index 0f97986..7d42e8e 100644
--- a/debian/libicap1.symbols.mips64el
+++ b/debian/libicap1.symbols.mips64el
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.ppc64 b/debian/libicap1.symbols.ppc64
index 1bf26b8..43712e9 100644
--- a/debian/libicap1.symbols.ppc64
+++ b/debian/libicap1.symbols.ppc64
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.ppc64el b/debian/libicap1.symbols.ppc64el
index d0f5097..fa71bc6 100644
--- a/debian/libicap1.symbols.ppc64el
+++ b/debian/libicap1.symbols.ppc64el
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++|optional=templinst)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.s390x b/debian/libicap1.symbols.s390x
index e996bfa..3a48602 100644
--- a/debian/libicap1.symbols.s390x
+++ b/debian/libicap1.symbols.s390x
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/debian/libicap1.symbols.sparc64 b/debian/libicap1.symbols.sparc64
index 0f97986..7d42e8e 100644
--- a/debian/libicap1.symbols.sparc64
+++ b/debian/libicap1.symbols.sparc64
@@ -28,7 +28,6 @@ libicap.so.1 libicap1 #MINVER#
  (c++)"icap::util::read_chunk_header(psocksxx::iosockstream*, icap::util::chunk_t&)@Base" 1.0.0
  (c++)"icap::util::read_chunked_payload(psocksxx::iosockstream*, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::read_req_continue_data(icap::Request*, psocksxx::iosockstream*)@Base" 1.0.0
- (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<int>(int)@Base" 1.0.0
  (c++)"std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > icap::util::itoa<long>(long)@Base" 1.0.0
  (c++)"icap::util::trim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
  (c++)"icap::util::ltrim(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&)@Base" 1.0.0
diff --git a/lib/icap/Makefile.am b/lib/icap/Makefile.am
index f73a8f6..a5608db 100644
--- a/lib/icap/Makefile.am
+++ b/lib/icap/Makefile.am
@@ -1,5 +1,5 @@
 ## [icap-library] lib/icap/
-AM_CPPFLAGS             = -I$(top_srcdir)/lib ${psocksxx_CFLAGS}
+AM_CPPFLAGS             = -std=c++11 -I$(top_srcdir)/lib ${psocksxx_CFLAGS}
 libicapincludedir       = $(includedir)/icap
 
 lib_LTLIBRARIES         = libicap.la
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 ) );
 
 			}
 
diff --git a/modules/echo/echo.cpp b/modules/echo/echo.cpp
index a8496c5..4250802 100644
--- a/modules/echo/echo.cpp
+++ b/modules/echo/echo.cpp
@@ -32,8 +32,12 @@ namespace bitz {
 		icap::payload_t payload;
 
 		// copy payload from request
-		payload.req_header = request->payload().req_header;
-		payload.req_body   = request->payload().req_body;
+		if ( request->header()->method() == "REQMOD" ) {
+			payload.req_header = request->payload().req_header;
+			payload.req_body   = request->payload().req_body;
+		}
+
+		// response body should only have content for RESPMOD requests
 		payload.res_header = request->payload().res_header;
 		payload.res_body   = request->payload().res_body;
 
diff --git a/modules/modpy/modules/modpy.py b/modules/modpy/modules/modpy.py
index 874a615..1751cca 100644
--- a/modules/modpy/modules/modpy.py
+++ b/modules/modpy/modules/modpy.py
@@ -31,8 +31,13 @@ def modify( request ):
 
 	# response
 	resp_payload = {};
-	resp_payload['req_header'] = req_payload['req_header'];
-	resp_payload['req_body']   = req_payload['req_body'];
+	if request['request'] == 'REQMOD':
+		resp_payload['req_header'] = req_payload['req_header'];
+		resp_payload['req_body']   = req_payload['req_body'];
+	else:
+		resp_payload['req_header'] = '';
+		resp_payload['req_body']   = '';
+
 	resp_payload['res_header'] = req_payload['res_header'];
 	resp_payload['res_body']   = req_payload['res_body'];
 	resp_payload['ieof']       = True;