| OLD | NEW |
| 1 // Copyright 2007, Google Inc. | 1 // Copyright 2007, Google Inc. |
| 2 // All rights reserved. | 2 // All rights reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
| 9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
| 10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 | 29 |
| 30 #include "base/logging.h" | 30 #include "base/logging.h" |
| 31 #include "googleurl/src/url_canon.h" | 31 #include "url/url_canon.h" |
| 32 #include "googleurl/src/url_canon_internal.h" | 32 #include "url/url_canon_internal.h" |
| 33 | 33 |
| 34 namespace url_canon { | 34 namespace url_canon { |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| 37 | 37 |
| 38 // For reference, here's what IE supports: | 38 // For reference, here's what IE supports: |
| 39 // Key: 0 (disallowed: failure if present in the input) | 39 // Key: 0 (disallowed: failure if present in the input) |
| 40 // + (allowed either escaped or unescaped, and unmodified) | 40 // + (allowed either escaped or unescaped, and unmodified) |
| 41 // U (allowed escaped or unescaped but always unescaped if present in | 41 // U (allowed escaped or unescaped but always unescaped if present in |
| 42 // escaped form) | 42 // escaped form) |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 392 } | 392 } |
| 393 | 393 |
| 394 void CanonicalizeHostVerbose(const char16* spec, | 394 void CanonicalizeHostVerbose(const char16* spec, |
| 395 const url_parse::Component& host, | 395 const url_parse::Component& host, |
| 396 CanonOutput* output, | 396 CanonOutput* output, |
| 397 CanonHostInfo *host_info) { | 397 CanonHostInfo *host_info) { |
| 398 DoHost<char16, char16>(spec, host, output, host_info); | 398 DoHost<char16, char16>(spec, host, output, host_info); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace url_canon | 401 } // namespace url_canon |
| OLD | NEW |