LordMZTE
/
vieter
forked from vieter-v/vieter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'dev' into single-version-per-pkg

cron
Jef Roosens 2022-02-18 22:01:04 +01:00
parent 79b47a76e2 022f8c4fbe
commit 18edb0ea8d
Signed by untrusted user: Jef Roosens
GPG Key ID: 955C0660072F691F
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@
SRC_DIR := src SRC_DIR := src
SOURCES != find '$(SRC_DIR)' -iname '*.v' SOURCES != find '$(SRC_DIR)' -iname '*.v'
V_RELEASE := weekly.2022.06 V_RELEASE := weekly.2022.07
V_PATH ?= v-$(V_RELEASE)/v V_PATH ?= v-$(V_RELEASE)/v
V := $(V_PATH) -showcc -gc boehm V := $(V_PATH) -showcc -gc boehm

2
patches/patch.sh
View File

@ -6,8 +6,8 @@
# Add parse_request_no_body # Add parse_request_no_body
cat parse_request_no_body.v >> "$1"/vlib/net/http/request.v 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 # Make sha256 functions public
sed -i \ sed -i \
-e 's/\(fn (mut d Digest) checksum(\)/pub \1/' \ -e 's/\(fn (mut d Digest) checksum(\)/pub \1/' \
-e 's/\(fn (mut d Digest) write(\)/pub \1/' \
"$1"/vlib/crypto/sha256/sha256.v "$1"/vlib/crypto/sha256/sha256.v

6
src/web/parse.v
View File

@ -34,7 +34,7 @@ fn parse_attrs(name string, attrs []string) ?([]http.Method, string) {
} }
if x.len > 0 { if x.len > 0 {
return IError(http.UnexpectedExtraAttributeError{ return IError(http.UnexpectedExtraAttributeError{
msg: 'Encountered unexpected extra attributes: $x' attributes: x
}) })
} }
if methods.len == 0 { 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 { fn parse_query_from_url(url urllib.URL) map[string]string {
mut query := map[string]string{} mut query := map[string]string{}
for k, v in url.query().data { for v in url.query().data {
query[k] = v.data[0] query[v.key] = v.value
} }
return query return query
} }