Commit 455224bb authored by Tatsuya Kinoshita's avatar Tatsuya Kinoshita Committed by GitHub

Merge pull request #93 from mackyle/master

correct <base ...> parsing and do not turn a form's GET into POST
parents 1ac245bd 89e60cc4
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment