[Webkit-unassigned] [Bug 127104] [SOUP] Remove soupURIToKURL

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Mon Jan 27 10:30:50 PST 2014


https://bugs.webkit.org/show_bug.cgi?id=127104





--- Comment #13 from Carlos Garcia Campos <cgarcia at igalia.com>  2014-01-27 10:28:13 PST ---
(In reply to comment #12)
> (From update of attachment 222272 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=222272&action=review
> 
> > Source/WebCore/platform/URL.h:168
> > +    URL(SoupURI*);
> 
> Perhaps this should be marked "explicit."

I thought about it, but other platform constructor don't do that so I followed it :-P

> > Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp:129
> > +GUniquePtr<SoupURI> ResourceRequest::createSoupURI() const
> >  {
> > -    // WebKit does not support fragment identifiers in data URLs, but soup does.
> > -    // Before passing the URL to soup, we should make sure to urlencode any '#'
> > -    // characters, so that soup does not interpret them as fragment identifiers.
> > -    // See http://wkbug.com/68089
> > -    if (m_url.protocolIsData()) {
> > -        String urlString = m_url.string();
> > -        urlString.replace("#", "%23");
> > -        return soup_uri_new(urlString.utf8().data());
> > -    }
> > -
> >      URL url = m_url;
> >      url.removeFragmentIdentifier();
> > -    SoupURI* uri = soup_uri_new(url.string().utf8().data());
> > -
> > -    // Versions of libsoup prior to 2.42 have a soup_uri_new that will convert empty passwords that are not
> > -    // prefixed by a colon into null. Some parts of soup like the SoupAuthenticationManager will only be active
> > -    // when both the username and password are non-null. When we have credentials, empty usernames and passwords
> > -    // should be empty strings instead of null.
> > -    if (!url.user().isEmpty() || !url.pass().isEmpty()) {
> > -        soup_uri_set_user(uri, url.user().utf8().data());
> > -        soup_uri_set_password(uri, url.pass().utf8().data());
> > -    }
> > -    return uri;
> > +    return url.createSoupURI();
> >  }
> 
> Can we just get rid of this entirely in favor of url().createSoupURI()?

I left this just because of the url.removeFragmentIdentifier(); I assumed that's desired only in the cases where this method is called.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.


More information about the webkit-unassigned mailing list