Fixed jonashaag#57: File wrapper should accept optional 'chunksize' a…

…rgument

LICENSE

@@ -1,5 +1,5 @@
 
-    Copyright (c) 2010-2011 Jonas Haag <[email protected]> and contributors.
+    Copyright (c) 2010-2013 Jonas Haag <[email protected]> and contributors.
     All rights reserved.
     License: 2-clause-BSD (Berkley Software Distribution) license
 

Makefile

@@ -49,7 +49,7 @@ debug:
 	CFLAGS='-D DEBUG' make again
 
 $(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.c
-	@echo ' -> ' $(CC) -c $< -o $@
+	@echo ' -> ' $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 	@$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
 # foo.o: shortcut to $(BUILD_DIR)/foo.o

bjoern/filewrapper.c

@@ -4,16 +4,22 @@ static PyObject*
 FileWrapper_New(PyTypeObject* cls, PyObject* args, PyObject* kwargs)
 {
   PyObject* file;
-  if(!PyArg_ParseTuple(args, "O:FileWrapper", &file))
+  unsigned int ignored_blocksize;
+
+  if(!PyArg_ParseTuple(args, "O|I:FileWrapper", &file, &ignored_blocksize))
     return NULL;
+
   if(!PyFile_Check(file)) {
     TYPE_ERROR("FileWrapper argument", "file", file);
     return NULL;
   }
+
   Py_INCREF(file);
-  FileWrapper* wrapper = PyObject_NEW(FileWrapper, &FileWrapper_Type);
   PyFile_IncUseCount((PyFileObject*)file);
+
+  FileWrapper* wrapper = PyObject_NEW(FileWrapper, cls);
   wrapper->file = file;
+
   return (PyObject*)wrapper;
 }
 

bjoern/server.c

@@ -234,13 +234,15 @@ ev_io_on_write(struct ev_loop* mainloop, ev_io* watcher, const int events)
       /* current_chunk contains the HTTP headers */
       if(send_chunk(request))
         goto out;
-      assert(!request->current_chunk_p);
+      assert(request->current_chunk_p == 0);
       /* abuse current_chunk_p to store the file fd */
       request->current_chunk_p = PyObject_AsFileDescriptor(request->iterable);
       goto out;
     }
+
     if(do_sendfile(request))
       goto out;
+
   } else {
     /* iterable */
     if(send_chunk(request))
@@ -307,7 +309,7 @@ send_chunk(Request* request)
 
   assert(request->current_chunk != NULL);
   assert(!(request->current_chunk_p == PyString_GET_SIZE(request->current_chunk)
-         && PyString_GET_SIZE(request->current_chunk) != 0));
+           && PyString_GET_SIZE(request->current_chunk) != 0));
 
   bytes_sent = write(
     request->client_fd,

tests/filewrapper.py

@@ -3,9 +3,10 @@
 import bjoern
 
 W = {
-    'callable-iterator' : lambda f, e: iter(lambda: f.read(64*1024), ''),
-    'xreadlines' : lambda f, e: f,
-    'filewrapper' : lambda f, env: env['wsgi.file_wrapper'](f)
+    'callable-iterator': lambda f, e: iter(lambda: f.read(64*1024), ''),
+    'xreadlines': lambda f, e: f,
+    'filewrapper': lambda f, env: env['wsgi.file_wrapper'](f),
+    'filewrapper2': lambda f, env: env['wsgi.file_wrapper'](f, 1)
 }
 
 F = len(sys.argv) > 1 and sys.argv[1] or 'README.rst'