vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

vweb: change Context.headers from string to struct Header (#10749)

pull/10851/head
Miccah 2021-07-18 04:21:07 -05:00 committed by GitHub
parent d5e0fa6d1b
commit 1a6a7a678a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/vweb/vweb_example.v
View File

@ -49,7 +49,7 @@ pub fn (mut app App) show_text() vweb.Result {
pub fn (mut app App) cookie() vweb.Result { pub fn (mut app App) cookie() vweb.Result {
app.set_cookie(name: 'cookie', value: 'test') app.set_cookie(name: 'cookie', value: 'test')
return app.text('Headers: $app.headers') return app.text('Response Headers\n$app.header')
} }
[post] [post]

40
vlib/vweb/vweb.v
View File

@ -8,7 +8,6 @@ import io
import net import net
import net.http import net.http
import net.urllib import net.urllib
import strings
import time import time
pub const ( pub const (
@ -80,7 +79,7 @@ pub mut:
form map[string]string form map[string]string
query map[string]string query map[string]string
files map[string][]FileData files map[string][]FileData
headers string // response headers header http.Header // response headers
done bool done bool
page_gen_start i64 page_gen_start i64
form_error string form_error string
@ -128,23 +127,20 @@ pub fn (mut ctx Context) send_response_to_client(mimetype string, res string) bo
return false return false
} }
ctx.done = true ctx.done = true
mut sb := strings.new_builder(1024)
defer { // build header
unsafe { sb.free() } header := http.new_header_from_map(map{
http.CommonHeader.content_type: mimetype
http.CommonHeader.content_length: res.len.str()
}).join(ctx.header)
resp := http.Response{
version: .v1_1
status_code: ctx.status.int() // TODO: change / remove ctx.status
header: header.join(vweb.headers_close)
text: res
} }
sb.write_string('HTTP/1.1 $ctx.status') send_string(mut ctx.conn, resp.bytestr()) or { return false }
sb.write_string('\r\nContent-Type: $mimetype')
sb.write_string('\r\nContent-Length: $res.len')
sb.write_string(ctx.headers)
sb.write_string('\r\n')
sb.write_string(vweb.headers_close.str())
sb.write_string('\r\n')
sb.write_string(res)
s := sb.str()
defer {
unsafe { s.free() }
}
send_string(mut ctx.conn, s) or { return false }
return true return true
} }
@ -190,7 +186,7 @@ pub fn (mut ctx Context) redirect(url string) Result {
return Result{} return Result{}
} }
ctx.done = true ctx.done = true
send_string(mut ctx.conn, 'HTTP/1.1 302 Found\r\nLocation: $url$ctx.headers\r\n$vweb.headers_close\r\n') or { send_string(mut ctx.conn, 'HTTP/1.1 302 Found\r\nLocation: $url$ctx.header\r\n$vweb.headers_close\r\n') or {
return Result{} return Result{}
} }
return Result{} return Result{}
@ -245,7 +241,7 @@ pub fn (ctx &Context) get_cookie(key string) ?string { // TODO refactor
} }
cookie_header = ' ' + cookie_header cookie_header = ' ' + cookie_header
// println('cookie_header="$cookie_header"') // println('cookie_header="$cookie_header"')
// println(ctx.req.headers) // println(ctx.req.header)
cookie := if cookie_header.contains(';') { cookie := if cookie_header.contains(';') {
cookie_header.find_between(' $key=', ';') cookie_header.find_between(' $key=', ';')
} else { } else {
@ -268,9 +264,7 @@ pub fn (mut ctx Context) set_status(code int, desc string) {
// Adds an header to the response with key and val // Adds an header to the response with key and val
pub fn (mut ctx Context) add_header(key string, val string) { pub fn (mut ctx Context) add_header(key string, val string) {
// println('add_header($key, $val)') ctx.header.add_custom(key, val) or {}
ctx.headers = ctx.headers + '\r\n$key: $val'
// println(ctx.headers)
} }
// Returns the header data from the key // Returns the header data from the key