diff --git a/Makefile b/Makefile index 25cba312..7166c665 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SRC_DIR := src SOURCES != find '$(SRC_DIR)' -iname '*.v' -V_RELEASE := weekly.2022.06 +V_RELEASE := weekly.2022.07 V_PATH ?= v-$(V_RELEASE)/v V := $(V_PATH) -showcc -gc boehm diff --git a/patches/patch.sh b/patches/patch.sh index 98139769..89f21760 100755 --- a/patches/patch.sh +++ b/patches/patch.sh @@ -6,8 +6,8 @@ # Add parse_request_no_body cat parse_request_no_body.v >> "$1"/vlib/net/http/request.v +# weekly.2022.07 fixes the write function being private # Make sha256 functions public sed -i \ -e 's/\(fn (mut d Digest) checksum(\)/pub \1/' \ - -e 's/\(fn (mut d Digest) write(\)/pub \1/' \ "$1"/vlib/crypto/sha256/sha256.v diff --git a/src/web/parse.v b/src/web/parse.v index 554c9f07..b5925409 100644 --- a/src/web/parse.v +++ b/src/web/parse.v @@ -34,7 +34,7 @@ fn parse_attrs(name string, attrs []string) ?([]http.Method, string) { } if x.len > 0 { return IError(http.UnexpectedExtraAttributeError{ - msg: 'Encountered unexpected extra attributes: $x' + attributes: x }) } if methods.len == 0 { @@ -49,8 +49,8 @@ fn parse_attrs(name string, attrs []string) ?([]http.Method, string) { fn parse_query_from_url(url urllib.URL) map[string]string { mut query := map[string]string{} - for k, v in url.query().data { - query[k] = v.data[0] + for v in url.query().data { + query[v.key] = v.value } return query }