1 files changed, 6 insertions, 3 deletions

diff --git a/lib/openid_message.cc b/lib/openid_message.cc
index 4b9179b..e244f43 100644
--- a/lib/openid_message.cc
+++ b/lib/openid_message.cc
@@ -1,126 +1,129 @@
 #include <cassert>
 #include <opkele/types.h>
 #include <opkele/exception.h>
 #include <opkele/util.h>
 #include <opkele/debug.h>
 
 #include "config.h"
 
 namespace opkele {
     using std::input_iterator_tag;
     using std::unary_function;
 
     struct __om_copier : public unary_function<const string&,void> {
         public:
             const basic_openid_message& from;
             basic_openid_message& to;
 
             __om_copier(basic_openid_message& t,const basic_openid_message& f)
-                : from(f), to(t) {
-                    to.reset_fields();
-                }
+                : from(f), to(t) { }
 
             result_type operator()(argument_type f) {
                 to.set_field(f,from.get_field(f)); }
     };
 
     basic_openid_message::basic_openid_message(const basic_openid_message& x) {
         x.copy_to(*this);
     }
     void basic_openid_message::copy_to(basic_openid_message& x) const {
+        x.reset_fields();
+        for_each(fields_begin(),fields_end(),
+                __om_copier(x,*this) );
+    }
+    void basic_openid_message::append_to(basic_openid_message& x) const {
         for_each(fields_begin(),fields_end(),
                 __om_copier(x,*this) );
     }
 
     struct __om_ns_finder : public unary_function<const string&,bool> {
         public:
             const basic_openid_message& om;
             const string& uri;
 
             __om_ns_finder(const basic_openid_message& m,
                     const string& u) : om(m), uri(u) { }
 
             result_type operator()(argument_type f) {
                 return
                     (!strncmp(f.c_str(),"ns.",sizeof("ns.")-1))
                         && om.get_field(f)==uri ;
             }
     };
 
     bool basic_openid_message::has_ns(const string& uri) const {
         fields_iterator ei = fields_end();
         fields_iterator i = find_if(fields_begin(),fields_end(),
                 __om_ns_finder(*this,uri));
         return !(i==ei);
     }
     string basic_openid_message::get_ns(const string& uri) const {
         fields_iterator ei = fields_end();
         fields_iterator i = find_if(fields_begin(),fields_end(),
                 __om_ns_finder(*this,uri));
         if(i==ei)
             throw failed_lookup(OPKELE_CP_ string("failed to find namespace ")+uri);
         return i->substr(3);
     }
 
     struct __om_query_builder : public unary_function<const string&,void> {
         public:
             const basic_openid_message& om;
             bool first;
             string& rv;
             const char *pfx;
 
             __om_query_builder(const char *p,string& r,const basic_openid_message& m)
                 : om(m), first(true), rv(r), pfx(p) {
                     for_each(om.fields_begin(),om.fields_end(),*this);
                 }
             __om_query_builder(const char *p,string& r,const basic_openid_message& m,const string& u)
                 : om(m), first(true), rv(r), pfx(p) {
                     rv = u;
                     if(rv.find('?')==string::npos)
                         rv += '?';
                     else
                         first = false;
                     for_each(om.fields_begin(),om.fields_end(),*this);
                 }
 
             result_type operator()(argument_type f) {
                 if(first)
                     first = false;
                 else
                     rv += '&';
                 if(pfx) rv += pfx;
                 rv+= f;
                 rv += '=';
                 rv += util::url_encode(om.get_field(f));
             }
     };
 
     string basic_openid_message::append_query(const string& url,const char *pfx) const {
         string rv;
         return __om_query_builder(pfx,rv,*this,url).rv;
     }
     string basic_openid_message::query_string(const char *pfx) const {
         string rv;
         return __om_query_builder(pfx,rv,*this).rv;
     }
 
     void basic_openid_message::reset_fields() {
         throw not_implemented(OPKELE_CP_ "reset_fields() not implemented");
     }
     void basic_openid_message::set_field(const string&,const string&) {
         throw not_implemented(OPKELE_CP_ "set_field() not implemented");
     }
     void basic_openid_message::reset_field(const string&) {
         throw not_implemented(OPKELE_CP_ "reset_field() not implemented");
     }
 
     void basic_openid_message::from_keyvalues(const string& kv) {
         reset_fields();
         string::size_type p = 0;
         while(true) {
             string::size_type co = kv.find(':',p);
             if(co==string::npos)
                 break;
 #ifndef POSTELS_LAW
             string::size_type nl = kv.find('\n',co+1);
             if(nl==string::npos)