compiler: remove special case for http__init_module call

tmp fix until `fn init()` is supported
pull/2105/head
Delyan Angelov 2019-09-25 23:28:51 +03:00 committed by Alexander Medvednikov
parent 4c898ab6b3
commit ab291902d8
4 changed files with 4 additions and 7 deletions

View File

@ -357,11 +357,6 @@ fn (v mut V) generate_main() {
// if v.build_mode in [.default, .embed_vlib] { // if v.build_mode in [.default, .embed_vlib] {
if v.pref.build_mode == .default_mode || v.pref.build_mode == .embed_vlib { if v.pref.build_mode == .default_mode || v.pref.build_mode == .embed_vlib {
mut consts_init_body := cgen.consts_init.join_lines() mut consts_init_body := cgen.consts_init.join_lines()
for imp in v.table.imports {
if imp == 'http' {
consts_init_body += '\n http__init_module();'
}
}
// vlib can't have `init_consts()` // vlib can't have `init_consts()`
cgen.genln('void init_consts() { cgen.genln('void init_consts() {
#ifdef _WIN32 #ifdef _WIN32

View File

@ -27,7 +27,7 @@ struct C.SSL {
} }
fn init_module() { fn init() int {
$if mac { $if mac {
C.SSL_library_init() C.SSL_library_init()
} }
@ -36,6 +36,7 @@ fn init_module() {
} }
//C.SSL_load_error_strings() //C.SSL_load_error_strings()
//C.OPENSSL_config(0) //C.OPENSSL_config(0)
return 1
} }
fn (req &Request) ssl_do(port int, method, host_name, path string) Response { fn (req &Request) ssl_do(port int, method, host_name, path string) Response {

View File

@ -13,7 +13,7 @@ module http
fn C.new_tls_context() C.TlsContext fn C.new_tls_context() C.TlsContext
fn init_module() {} fn init() int { return 1 }
fn (req &Request) ssl_do(port int, method, host_name, path string) Response { fn (req &Request) ssl_do(port int, method, host_name, path string) Response {
mut ctx := C.new_tls_context() mut ctx := C.new_tls_context()

View File

@ -9,6 +9,7 @@ import http.chunked
const ( const (
max_redirects = 4 max_redirects = 4
started = http.init()
) )
struct Request { struct Request {