diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2013-07-30 11:13:51 +0000 |
| commit | 18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab (patch) | |
| tree | 88966004acc26ea238b5414bd569b86aac1b569d /frame.c | |
| parent | Sort anchors by sequence number in -dump (diff) | |
| parent | Merge branch 'feature/debian-version' (diff) | |
| download | w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.tar.gz w3m-18b0cc756bc5d5145fc1abcd0ef46ff2455c79ab.zip | |
Merge branch 'master' into bug/sort-dump-links
Conflicts:
main.c
Diffstat (limited to '')
| -rw-r--r-- | frame.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -91,7 +91,8 @@ newFrame(struct parsed_tag *tag, Buffer *buf) body->baseURL = baseURL(buf); if (tag) { if (parsedtag_get_value(tag, ATTR_SRC, &p)) - body->url = url_quote_conv(remove_space(p), buf->document_charset); + body->url = url_encode(remove_space(p), body->baseURL, + buf->document_charset); if (parsedtag_get_value(tag, ATTR_NAME, &p) && *p != '_') body->name = url_quote_conv(p, buf->document_charset); } @@ -639,7 +640,7 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level, case HTML_BASE: /* "BASE" is prohibit tag */ if (parsedtag_get_value(tag, ATTR_HREF, &q)) { - q = url_quote_conv(remove_space(q), charset); + q = url_encode(remove_space(q), NULL, charset); parseURL(q, &base, NULL); } if (parsedtag_get_value(tag, ATTR_TARGET, &q)) { @@ -768,8 +769,8 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level, if (!tag->value[j]) break; tag->value[j] = - url_quote_conv(remove_space(tag->value[j]), - charset); + url_encode(remove_space(tag->value[j]), + &base, charset); tag->need_reconstruct = TRUE; parseURL2(tag->value[j], &url, &base); if (url.scheme == SCM_UNKNOWN || |