OS X support

* abstract sendfile() differences
* memset-zero sockaddr_in before using
* build with -fcommon -- let the linker strip duplicate symbols

Closes jonashaag#60, jonashaag#59 and jonashaag#19.

Author: patricklucas

Makefile

@@ -15,7 +15,7 @@ objects		= $(HTTP_PARSER_OBJ) \
 CPPFLAGS	+= $(PYTHON_INCLUDE) -I . -I $(SOURCE_DIR) -I $(HTTP_PARSER_DIR)
 CFLAGS		+= $(FEATURES) -std=c99 -fno-strict-aliasing -Wall -Wextra \
 		   -Wno-unused -g -O0 -fPIC
-LDFLAGS		+= $(PYTHON_LDFLAGS) -l ev -shared
+LDFLAGS		+= $(PYTHON_LDFLAGS) -l ev -shared -fcommon
 
 ifneq ($(WANT_SENDFILE), no)
 FEATURES	+= -D WANT_SENDFILE

bjoern/portable_sendfile.c

@@ -0,0 +1,29 @@
+#include <stdlib.h>
+
+#define SENDFILE_CHUNK_SIZE 16*1024
+
+#ifdef __APPLE__
+
+  /* OS X */
+
+  #include <sys/socket.h>
+  #include <sys/types.h>
+
+  ssize_t portable_sendfile(int out_fd, int in_fd) {
+    off_t len = SENDFILE_CHUNK_SIZE;
+    if(sendfile(in_fd, out_fd, 0, &len, NULL, 0) == -1)
+      return -1;
+    return len;
+  }
+
+#else
+
+  /* Linux */
+
+  #include <sys/sendfile.h>
+
+  ssize_t portable_sendfile(int out_fd, int in_fd) {
+    return sendfile(out_fd, in_fd, NULL, SENDFILE_CHUNK_SIZE);
+  }
+
+#endif

bjoern/portable_sendfile.h

@@ -0,0 +1 @@
+ssize_t portable_sendfile(int out_fd, int in_fd);

bjoern/server.c

@@ -6,8 +6,8 @@
 #ifdef WANT_SIGINT_HANDLING
 # include <sys/signal.h>
 #endif
-#include <sys/sendfile.h>
 #include <ev.h>
+#include "portable_sendfile.h"
 #include "common.h"
 #include "wsgi.h"
 #include "server.h"
@@ -104,6 +104,7 @@ bool server_init(const char* hostaddr, const int port)
       return false;
 
     struct sockaddr_in sockaddr;
+    memset(&sockaddr, 0, sizeof(sockaddr));
     sockaddr.sin_family = PF_INET;
     inet_pton(AF_INET, hostaddr, &sockaddr.sin_addr);
     sockaddr.sin_port = htons(port);
@@ -302,7 +303,6 @@ ev_io_on_write(struct ev_loop* mainloop, ev_io* watcher, const int events)
 static bool
 send_chunk(Request* request)
 {
-  Py_ssize_t chunk_length;
   Py_ssize_t bytes_sent;
 
   assert(request->current_chunk != NULL);
@@ -327,15 +327,12 @@ send_chunk(Request* request)
   return true;
 }
 
-#define SENDFILE_CHUNK_SIZE 16*1024
-
 static bool
 do_sendfile(Request* request)
 {
-  Py_ssize_t bytes_sent = sendfile(
-    request->client_fd,
-    request->current_chunk_p, /* current_chunk_p stores the file fd */
-    NULL, SENDFILE_CHUNK_SIZE
+  Py_ssize_t bytes_sent = portable_sendfile(
+      request->client_fd,
+      request->current_chunk_p /* current_chunk_p stores the file fd */
   );
   if(bytes_sent == -1)
     return handle_nonzero_errno(request);

setup.py

@@ -14,7 +14,7 @@
                      ('WANT_SIGINT_HANDLING', '1')],
     extra_compile_args = ['-std=c99', '-fno-strict-aliasing', '-Wall',
                           '-Wextra', '-Wno-unused', '-g', '-fPIC',
-                          '-Wno-missing-field-initializers']
+                          '-Wno-missing-field-initializers', '-fcommon']
 )
 
 setup(