summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/util.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util.cc b/lib/util.cc
index ac70938..416e2cc 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -190,51 +190,51 @@ namespace opkele {
190 string::size_type ul = uri.length(); 190 string::size_type ul = uri.length();
191 if(ul <= (colon+3)) 191 if(ul <= (colon+3))
192 throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered"); 192 throw bad_input(OPKELE_CP_ "Unexpected end of URI being normalized encountered");
193 if(uri[colon+1]!='/' || uri[colon+2]!='/') 193 if(uri[colon+1]!='/' || uri[colon+2]!='/')
194 throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); 194 throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component");
195 rv += "//"; 195 rv += "//";
196 string::size_type interesting = uri.find_first_of(":/#?",colon+3); 196 string::size_type interesting = uri.find_first_of(":/#?",colon+3);
197 if(interesting==string::npos) { 197 if(interesting==string::npos) {
198 transform( 198 transform(
199 uri.begin()+colon+3,uri.end(), 199 uri.begin()+colon+3,uri.end(),
200 back_inserter(rv), ::tolower ); 200 back_inserter(rv), ::tolower );
201 rv += '/'; return rv; 201 rv += '/'; return rv;
202 } 202 }
203 transform( 203 transform(
204 uri.begin()+colon+3,uri.begin()+interesting, 204 uri.begin()+colon+3,uri.begin()+interesting,
205 back_inserter(rv), ::tolower ); 205 back_inserter(rv), ::tolower );
206 bool qf = false; 206 bool qf = false;
207 char ic = uri[interesting]; 207 char ic = uri[interesting];
208 if(ic==':') { 208 if(ic==':') {
209 string::size_type ni = uri.find_first_of("/#?%",interesting+1); 209 string::size_type ni = uri.find_first_of("/#?%",interesting+1);
210 const char *nptr = uri.data()+interesting+1; 210 const char *nptr = uri.data()+interesting+1;
211 char *eptr = 0; 211 char *eptr = 0;
212 long port = strtol(nptr,&eptr,10); 212 long port = strtol(nptr,&eptr,10);
213 if( (port>0) && (port<65535) && port!=(s?443:80) ) { 213 if( (port>0) && (port<65535) && port!=(s?443:80) ) {
214 char tmp[6]; 214 char tmp[8];
215 snprintf(tmp,sizeof(tmp),"%ld",port); 215 snprintf(tmp,sizeof(tmp),":%ld",port);
216 rv += ':'; rv += tmp; 216 rv += tmp;
217 } 217 }
218 if(ni==string::npos) { 218 if(ni==string::npos) {
219 rv += '/'; return rv; 219 rv += '/'; return rv;
220 } 220 }
221 interesting = ni; 221 interesting = ni;
222 }else if(ic!='/') { 222 }else if(ic!='/') {
223 rv += '/'; rv += ic; 223 rv += '/'; rv += ic;
224 qf = true; 224 qf = true;
225 ++interesting; 225 ++interesting;
226 } 226 }
227 string::size_type n = interesting; 227 string::size_type n = interesting;
228 char tmp[3] = { 0,0,0 }; 228 char tmp[3] = { 0,0,0 };
229 stack<string::size_type> psegs; psegs.push(rv.length()); 229 stack<string::size_type> psegs; psegs.push(rv.length());
230 string pseg; 230 string pseg;
231 for(;n<ul;) { 231 for(;n<ul;) {
232 string::size_type unsafe = uri.find_first_of(qf?"%":"%/?#",n); 232 string::size_type unsafe = uri.find_first_of(qf?"%":"%/?#",n);
233 if(unsafe==string::npos) { 233 if(unsafe==string::npos) {
234 pseg.append(uri,n,ul-n-1); n = ul-1; 234 pseg.append(uri,n,ul-n-1); n = ul-1;
235 }else{ 235 }else{
236 pseg.append(uri,n,unsafe-n); 236 pseg.append(uri,n,unsafe-n);
237 n = unsafe; 237 n = unsafe;
238 } 238 }
239 char c = uri[n++]; 239 char c = uri[n++];
240 if(c=='%') { 240 if(c=='%') {