-rw-r--r-- | lib/util.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/util.cc b/lib/util.cc index 69d37b5..83f0eef 100644 --- a/lib/util.cc +++ b/lib/util.cc | |||
@@ -187,12 +187,2 @@ namespace opkele { | |||
187 | bool s; | 187 | bool s; |
188 | if(rv=="http:") | ||
189 | s = false; | ||
190 | else if(rv=="https:") | ||
191 | s = true; | ||
192 | #ifndef NDEBUG | ||
193 | else if(rv=="file:") | ||
194 | s = false; | ||
195 | #endif /* XXX: or try to make tests work some other way */ | ||
196 | else | ||
197 | throw not_implemented(OPKELE_CP_ "Only http(s) URIs can be normalized here"); | ||
198 | string::size_type ul = uri.find_last_not_of(whitespace)+1; | 188 | string::size_type ul = uri.find_last_not_of(whitespace)+1; |
@@ -202,2 +192,14 @@ namespace opkele { | |||
202 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); | 192 | throw bad_input(OPKELE_CP_ "Unexpected input in URI being normalized after scheme component"); |
193 | if(rv=="http:") | ||
194 | s = false; | ||
195 | else if(rv=="https:") | ||
196 | s = true; | ||
197 | else{ | ||
198 | /* TODO: support more schemes. | ||
199 | * e.g. xri. How do we normalize | ||
200 | * xri? | ||
201 | */ | ||
202 | rv.append(uri,colon+1,ul-colon-1); | ||
203 | return rv; | ||
204 | } | ||
203 | rv += "//"; | 205 | rv += "//"; |