Skip to content

Modifications and cleanup for compilation on OS/X #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
waTeim wants to merge 4 commits into from
Closed

Modifications and cleanup for compilation on OS/X #42

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e40716d
Fixes/changes for OS/X compilation
waTeim Feb 13, 2014
7ad5009
Modified .gitignore to include files generated by build
waTeim Feb 13, 2014
da21676
Change getter to const
waTeim Feb 17, 2014
4d20b56
Fixed problem on OS/X; SOCK_CLOEXEC raises EPROTONOSUPPORT instead
waTeim Feb 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixed problem on OS/X; SOCK_CLOEXEC raises EPROTONOSUPPORT instead 
of EINVAL.
  • Loading branch information
@waTeim
waTeim committed Feb 18, 2014
commit 4d20b56236208b837e59b1f589ad30d4f22068d3
14 changes: 12 additions & 2 deletions src/webserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ int create_socket (int domain, int type, int protocol)
/* use SOCK_STREAM rather than ai_socktype: some getaddrinfo
* implementations do not set ai_socktype, e.g. RHL6.2. */
fd = socket(domain, ctype, protocol);
if ( (-1 == fd) && (EINVAL == errno) && (0 != sock_cloexec) )
if ( (fd == -1) && (errno == EINVAL || errno == EPROTONOSUPPORT) && (sock_cloexec != 0) )
{
sock_cloexec = 0;
fd = socket(domain, type, protocol);
Expand Down Expand Up @@ -512,6 +512,12 @@ bool webserver::start(bool blocking)
else
bind_socket = create_socket (PF_INET, SOCK_STREAM, 0);

if(bind_socket == -1)
{
perror("Unable to create socket");
abort();
}

setsockopt (bind_socket,
SOL_SOCKET,
SO_REUSEADDR,
Expand All @@ -528,7 +534,11 @@ bool webserver::start(bool blocking)
#endif
#endif
}
bind(bind_socket, servaddr, addrlen);
if(bind(bind_socket, servaddr, addrlen) == -1)
{
perror("Unable to bind specified server address");
abort();
}
}
int flags = fcntl (bind_socket, F_GETFL);
flags |= O_NONBLOCK;
Expand Down