| -rw-r--r-- | lib/consumer.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc index cbe0769..bb6358c 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc @@ -312,30 +312,37 @@ namespace opkele { assoc_t consumer_t::find_assoc(const string& server) { throw failed_lookup(OPKELE_CP_ "no find_assoc() provided"); } string consumer_t::canonicalize(const string& url) { string rv = url; // strip leading and trailing spaces string::size_type i = rv.find_first_not_of(" \t\r\n"); if(i==string::npos) throw bad_input(OPKELE_CP_ "empty URL"); if(i) rv.erase(0,i); i = rv.find_last_not_of(" \t\r\n"); assert(i!=string::npos); if(i<(rv.length()-1)) rv.erase(i+1); // add missing http:// i = rv.find("://"); if(i==string::npos) { // primitive. but do we need more? rv.insert(0,"http://"); i = sizeof("http://")-1; }else{ i += sizeof("://")-1; } - if(rv.find('/',i)==string::npos) + string::size_type qm = rv.find('?',i); + string::size_type sl = rv.find('/',i); + if(qm!=string::npos) { + if(sl==string::npos || sl>qm) + rv.insert(qm,1,'/'); + }else{ + if(sl==string::npos) rv += '/'; + } return rv; } } |