diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2017-08-27 14:06:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-27 14:06:07 +0000 |
| commit | 455224bb5bb91b29e7665af537c5c8950f43030f (patch) | |
| tree | 7833a29a279ea67fbfc3f248f97aa699e71768bf | |
| parent | Update ChangeLog (diff) | |
| parent | form.c: do not gratuitously turn GET into POST (diff) | |
| download | w3m-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
| -rw-r--r-- | file.c | 2 | ||||
| -rw-r--r-- | form.c | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -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 @@ -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 |