summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-01-09 20:04:29 (UTC)
committer Michael Krelin <hacker@klever.net>2007-01-09 20:04:29 (UTC)
commit46fa1790c6d5e990030d8b2b7ae07cb150a49730 (patch) (side-by-side diff)
tree115419ff78232cfec478222b372d8c60e15dd0fc
parentadc2d682fa4f0aa83b4359bb212eda616cbe39dd (diff)
downloadlibopkele-46fa1790c6d5e990030d8b2b7ae07cb150a49730.zip
libopkele-46fa1790c6d5e990030d8b2b7ae07cb150a49730.tar.gz
libopkele-46fa1790c6d5e990030d8b2b7ae07cb150a49730.tar.bz2
canonicalization bug - do not add '/' after '?', add it right after hostname if needed.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/consumer.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/consumer.cc b/lib/consumer.cc
index cbe0769..bb6358c 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -335,4 +335,11 @@ namespace opkele {
}
- if(rv.find('/',i)==string::npos)
- rv += '/';
+ 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;