Midori Web Browser

Merge lp://staging/~kalikiana/midori/urlunescaping into lp://staging/midori

  1. urlunescaping
  2. Merge into trunk
Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp://staging/~kalikiana/midori/urlunescaping
Merge into: lp://staging/midori
Diff against target: 46 lines (+11/-6)
2 files modified
katze/midori-uri.vala (+6/-6)
tests/magic-uri.c (+5/-0)
To merge this branch: bzr merge lp://staging/~kalikiana/midori/urlunescaping
Reviewer Review Type Date Requested Status
gue5t gue5t Needs Fixing
Review via email: mp+179300@code.staging.launchpad.net

Commit message

Midori.URI.unescape and don't unescape %

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) wrote :

The test is wrong: we *do* want to unescape the %21 to '!' in <http://www.google.com/%21%00ok>; it should be unescaped to <http://www.google.com/!%00ok>, such that the presence of %00 does not alter the transformation we apply to the "%21" sequence.

Another solid test case is <http://everything2.com/title/%2526%252364%253B>, which we currently *over*-unescape (to "http://everything2.com/title/%26%2364%3B"), such that after visiting the url hitting Enter in the url bar will reach a 404 page. It's actually as escaped as it can be as presented ("http://everything2.com/title/%2526%252364%253B"): the only escaped characters are %25s, which shouldn't be unescaped (since doing so would cause them to "eat" following digits when a user hits enter).

review: Needs Fixing
Reply

Unmerged revisions

6329. By Cris Dywan

Don't unescape % in encoded URLs

6328. By Cris Dywan

Clarify the intention of Midori.URI.unescape

6327. By Cris Dywan

Drop superfluous null check on unescape()

We pass a guaranteed non-null and it doesn't accept null either

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: