aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2017-08-27 14:06:07 +0000
committerGitHub <noreply@github.com>2017-08-27 14:06:07 +0000
commit455224bb5bb91b29e7665af537c5c8950f43030f (patch)
tree7833a29a279ea67fbfc3f248f97aa699e71768bf
parentUpdate ChangeLog (diff)
parentform.c: do not gratuitously turn GET into POST (diff)
downloadw3m-455224bb5bb91b29e7665af537c5c8950f43030f.tar.gz
w3m-455224bb5bb91b29e7665af537c5c8950f43030f.zip
Merge pull request #93 from mackyle/master
correct <base ...> parsing and do not turn a form's GET into POST
Diffstat (limited to '')
-rw-r--r--file.c2
-rw-r--r--form.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/file.c b/file.c
index 4d15ff1..9b0e947 100644
--- a/file.c
+++ b/file.c
@@ -5993,7 +5993,7 @@ HTMLlineproc2body(Buffer *buf, Str (*feed) (), int llimit)
buf->document_charset);
if (!buf->baseURL)
buf->baseURL = New(ParsedURL);
- parseURL(p, buf->baseURL, NULL);
+ parseURL2(p, buf->baseURL, &buf->currentURL);
#if defined(USE_M17N) || defined(USE_IMAGE)
base = buf->baseURL;
#endif
diff --git a/form.c b/form.c
index 0605513..cc5e3d2 100644
--- a/form.c
+++ b/form.c
@@ -56,10 +56,9 @@ newFormList(char *action, char *method, char *charset, char *enctype,
m = FORM_METHOD_INTERNAL;
/* unknown method is regarded as 'get' */
- if (enctype != NULL && !strcasecmp(enctype, "multipart/form-data")) {
+ if (m != FORM_METHOD_GET && enctype != NULL &&
+ !strcasecmp(enctype, "multipart/form-data")) {
e = FORM_ENCTYPE_MULTIPART;
- if (m == FORM_METHOD_GET)
- m = FORM_METHOD_POST;
}
#ifdef USE_M17N