fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-19 03:41:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/vm_refactor

Browse Source
This commit is contained in:
Brandon Fish
2019-01-20 09:35:59 -06:00
parent 808aacde2d 00d5dd8c89
commit 922ec686e1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/nginx/.gitignore vendored
View File

@ -1 +1,2 @@
*_temp *_temp
logs/error.log

2
examples/nginx/logs/nginx.pid
View File

@ -1 +1 @@
96248 21011

4
lib/emscripten/src/syscalls.rs
View File

@ -366,9 +366,6 @@ pub extern "C" fn ___syscall102(
let address_len: u32 = socket_varargs.get(instance); let address_len: u32 = socket_varargs.get(instance);
let address = instance.memory_offset_addr(0, address as usize) as *mut sockaddr; let address = instance.memory_offset_addr(0, address as usize) as *mut sockaddr;
// we convert address as a sockaddr (even if this is incorrect), to bypass the type
// issue with libc bind
// Debug received address // Debug received address
unsafe { unsafe {
let proper_address = address as *const GuestSockaddrIn; let proper_address = address as *const GuestSockaddrIn;
@ -438,6 +435,7 @@ pub extern "C" fn ___syscall102(
unsafe { unsafe {
ioctl(fd, FIOCLEX); ioctl(fd, FIOCLEX);
}; };
debug!("fd: {}", fd); debug!("fd: {}", fd);
fd fd