| 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 12 matching lines...) Expand all Loading... |
| 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 // Canonicalizer functions for working with and resolving relative URLs. | 30 // Canonicalizer functions for working with and resolving relative URLs. |
| 31 | 31 |
| 32 #include "base/logging.h" | 32 #include "base/logging.h" |
| 33 #include "googleurl/src/url_canon.h" | 33 #include "url/url_canon.h" |
| 34 #include "googleurl/src/url_canon_internal.h" | 34 #include "url/url_canon_internal.h" |
| 35 #include "googleurl/src/url_file.h" | 35 #include "url/url_file.h" |
| 36 #include "googleurl/src/url_parse_internal.h" | 36 #include "url/url_parse_internal.h" |
| 37 #include "googleurl/src/url_util_internal.h" | 37 #include "url/url_util_internal.h" |
| 38 | 38 |
| 39 namespace url_canon { | 39 namespace url_canon { |
| 40 | 40 |
| 41 namespace { | 41 namespace { |
| 42 | 42 |
| 43 // Firefox does a case-sensitive compare (which is probably wrong--Mozilla bug | 43 // Firefox does a case-sensitive compare (which is probably wrong--Mozilla bug |
| 44 // 379034), whereas IE is case-insensetive. | 44 // 379034), whereas IE is case-insensetive. |
| 45 // | 45 // |
| 46 // We choose to be more permissive like IE. We don't need to worry about | 46 // We choose to be more permissive like IE. We don't need to worry about |
| 47 // unescaping or anything here: neither IE or Firefox allow this. We also | 47 // unescaping or anything here: neither IE or Firefox allow this. We also |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 const url_parse::Component& relative_component, | 570 const url_parse::Component& relative_component, |
| 571 CharsetConverter* query_converter, | 571 CharsetConverter* query_converter, |
| 572 CanonOutput* output, | 572 CanonOutput* output, |
| 573 url_parse::Parsed* out_parsed) { | 573 url_parse::Parsed* out_parsed) { |
| 574 return DoResolveRelativeURL<char16>( | 574 return DoResolveRelativeURL<char16>( |
| 575 base_url, base_parsed, base_is_file, relative_url, | 575 base_url, base_parsed, base_is_file, relative_url, |
| 576 relative_component, query_converter, output, out_parsed); | 576 relative_component, query_converter, output, out_parsed); |
| 577 } | 577 } |
| 578 | 578 |
| 579 } // namespace url_canon | 579 } // namespace url_canon |
| OLD | NEW |