0
@@ -74,10 +74,8 @@ allows Ebb to continue to process other clients while the upload is in
0
 progress. The cliff at 40k here is because Ebb's internal request
0
 buffer is set at 40 kilobytes before it writes to file.
0
 
0
-
0
 ## Contributions
0
 
0
-
0
 Contributions (patches, criticism, advice) are very welcome! The source code
0
 is hosted at [repo.or.cz](http://repo.or.cz/w/ebb.git). It can be retrieved 
0
 by executing
0
@@ -86,9 +84,9 @@ by executing
0
 
0
 I intend to keep the C code base very small, so do email me before writing any
0
 large additions. Here are some features that I would like to add:
0
-
0
-* Multipart parser
0
-* Streaming responses
0
+* Streaming responses!
0
+* HTTP 1.1 Expect/Continue (RFC 2616, sections 8.2.3 and 10.1.1)
0
+* A parser for multipart/form-data
0
 * Optimize and clean up upload handling
0
 * Option to listen on unix sockets instead of TCP
0
 * Python binding

0
@@ -3,6 +3,22 @@ require 'rake/testtask'
0
 require 'rake/gempackagetask'
0
 require 'rake/clean'
0
 
0
+COMMON_DISTFILES = FileList.new('src/ebb.{c,h}', 'src/parser.{c,h}', 
0
+  'libev/*', 'VERSION', 'README')
0
+
0
+RUBY_DISTFILES = COMMON_DISTFILES + FileList.new('src/ebb_ruby.c', 
0
+  'src/extconf.rb', 'ruby_lib/**/*', 'benchmark/*.rb', 'bin/ebb_rails', 
0
+  'test/*')
0
+
0
+PYTHON_DISTFILES = COMMON_DISTFILES + FileList.new('setup.py', 
0
+  'src/ebb_python.c')
0
+
0
+CLEAN.add ["**/*.{o,bundle,so,obj,pdb,lib,def,exp}", "benchmark/*.dump", 
0
+  'site/index.html', 'MANIFEST']
0
+
0
+CLOBBER.add ['src/Makefile', 'src/parser.c', 'src/mkmf.log', 'build']
0
+
0
+
0
 def dir(path)
0
   File.expand_path File.join(File.dirname(__FILE__), path)
0
 end
0
@@ -15,6 +31,12 @@ task(:compile => 'src/parser.c') do
0
   sh "cd #{dir('src')} && ruby extconf.rb && make"
0
 end
0
 
0
+file('MANIFEST') do
0
+  File.open(dir('MANIFEST'), "w+") do |manifest|
0
+    PYTHON_DISTFILES.each { |file| manifest.puts(file) }
0
+  end
0
+end
0
+
0
 file('src/parser.c' => 'src/parser.rl') do
0
   #sh "ragel src/parser.rl | rlgen-cd -G2 -o src/parser.c"
0
   sh 'ragel -G2 src/parser.rl'
0
@@ -71,21 +93,9 @@ spec = Gem::Specification.new do |s|
0
   s.bindir = 'bin'
0
   s.executables = %w(ebb_rails)
0
   
0
-  s.files = FileList.new('src/*.{rl,c,h}',
0
-                         'src/extconf.rb',
0
-                         'libev/*',
0
-                         'ruby_lib/**/*',
0
-                         'benchmark/*.rb',
0
-                         'bin/ebb_rails',
0
-                         'VERSION',
0
-                         'README')
0
+  s.files = RUBY_DISTFILES
0
 end
0
 
0
 Rake::GemPackageTask.new(spec) do |pkg|
0
   pkg.need_zip = true
0
-end
0
-
0
-
0
-
0
-CLEAN.add ["**/*.{o,bundle,so,obj,pdb,lib,def,exp}", "benchmark/*.dump", 'site/index.html']
0
-CLOBBER.add ['src/Makefile', 'src/parser.c', 'src/mkmf.log','doc', 'coverage']
0
+end
0
\ No newline at end of file

0
@@ -0,0 +1,24 @@
0
+#!/usr/bin/env python
0
+from distutils.core import setup
0
+from distutils.extension import Extension
0
+import commands
0
+
0
+def pkgconfig(*packages, **kw):
0
+    flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}
0
+    for token in commands.getoutput("pkg-config --libs --cflags %s" % ' '.join(packages)).split():
0
+        kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])
0
+    return kw
0
+
0
+ebb_ext = Extension( "ebb_ext"
0
+                   , ["src/ebb_python.c"]
0
+                   , **pkgconfig('glib-2.0', include_dirs = ['libev'])
0
+                   )
0
+
0
+setup( name = "Ebb"
0
+     , description = "a wsgi web server"
0
+     , version = "0.0.3"
0
+     , author = "ry dahl"
0
+     , author_email = "ry at tiny clouds dot org"
0
+     , url = "http://ebb.rubyforge.org/"
0
+     , ext_modules = [ebb_ext]
0
+     )
0
\ No newline at end of file

0
@@ -1,6 +1,6 @@
0
-/* Ebb Web Server
0
- * Copyright (c) 2007 Ry Dahl
0
- * This software is released under the "MIT License". See README file for details.
0
+/* The Ebb Web Server
0
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
0
+ * License. See README file for details.
0
  */
0
 #include <unistd.h>
0
 #include <fcntl.h>

0
@@ -1,6 +1,6 @@
0
-/* Ebb Web Server
0
- * Copyright (c) 2007 Ry Dahl <ry.d4hl@gmail.com>
0
- * This software is released under the "MIT License". See README file for details.
0
+/* The Ebb Web Server
0
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
0
+ * License. See README file for details.
0
  */
0
 #ifndef ebb_h
0
 #define ebb_h

0
@@ -0,0 +1,78 @@
0
+/* A python binding to the ebb web server
0
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
0
+ * License. See README file for details.
0
+ */
0
+#include <Python.h>
0
+#include <ebb.h>
0
+#include <ev.h>
0
+
0
+typedef struct {
0
+    PyObject_HEAD
0
+    ebb_server *server;
0
+} Server;
0
+
0
+static PyMethodDef Server_methods[] = {
0
+    {"name", (PyCFunction)Noddy_name, METH_NOARGS,
0
+     "Return the name, combining the first and last name"
0
+    },
0
+    {NULL}  /* Sentinel */
0
+};
0
+
0
+static PyTypeObject ServerType = {
0
+    PyObject_HEAD_INIT(NULL)
0
+    0,                         /*ob_size*/
0
+    "ebb.Server",              /*tp_name*/
0
+    sizeof(Server),             /*tp_basicsize*/
0
+    0,                         /*tp_itemsize*/
0
+    (destructor)Server_dealloc, /*tp_dealloc*/
0
+    0,                         /*tp_print*/
0
+    0,                         /*tp_getattr*/
0
+    0,                         /*tp_setattr*/
0
+    0,                         /*tp_compare*/
0
+    0,                         /*tp_repr*/
0
+    0,                         /*tp_as_number*/
0
+    0,                         /*tp_as_sequence*/
0
+    0,                         /*tp_as_mapping*/
0
+    0,                         /*tp_hash */
0
+    0,                         /*tp_call*/
0
+    0,                         /*tp_str*/
0
+    0,                         /*tp_getattro*/
0
+    0,                         /*tp_setattro*/
0
+    0,                         /*tp_as_buffer*/
0
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
0
+    "Ebb Server",           /* tp_doc */
0
+    0,                   /* tp_traverse */
0
+    0,                   /* tp_clear */
0
+    0,                   /* tp_richcompare */
0
+    0,                   /* tp_weaklistoffset */
0
+    0,                   /* tp_iter */
0
+    0,                   /* tp_iternext */
0
+    Server_methods,             /* tp_methods */
0
+    0,                         /* tp_members */
0
+    0,                         /* tp_getset */
0
+    0,                         /* tp_base */
0
+    0,                         /* tp_dict */
0
+    0,                         /* tp_descr_get */
0
+    0,                         /* tp_descr_set */
0
+    0,                         /* tp_dictoffset */
0
+    (initproc)Server_init,      /* tp_init */
0
+    0,                         /* tp_alloc */
0
+    Server_new,                 /* tp_new */
0
+};
0
+
0
+initebb(void) 
0
+{
0
+  PyObject *m, *d, *tmp;
0
+  ServerType.ob_type = &PyType_Type;
0
+
0
+  m = Py_InitModule("Ebb", GeoIP_Class_methods);
0
+  d = PyModule_GetDict(m);
0
+
0
+  tmp = PyInt_FromLong(0);
0
+  PyDict_SetItemString(d, "GEOIP_STANDARD", tmp);
0
+  Py_DECREF(tmp);
0
+
0
+  tmp = PyInt_FromLong(1);
0
+  PyDict_SetItemString(d, "GEOIP_MEMORY_CACHE", tmp);
0
+  Py_DECREF(tmp);
0
+}
0
\ No newline at end of file

0
@@ -1,8 +1,7 @@
0
 /* A ruby binding to the ebb web server
0
- * Copyright (c) 2007 Ry Dahl <ry.d4hl@gmail.com>
0
- * This software is released under the "MIT License". See README file for details.
0
+ * Copyright (c) 2008 Ry Dahl. This software is released under the MIT 
0
+ * License. See README file for details.
0
  */
0
-
0
 #include <ruby.h>
0
 #include <assert.h>
0
 #include <fcntl.h>

0
@@ -38,6 +38,8 @@ $LDFLAGS << " -lpthread "
0
 $CFLAGS << " -I#{libev_dir} " << flags.join(' ')
0
 $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
0
 
0
+$srcs = ['ebb.c', 'ebb_ruby.c', 'parser.c']
0
+$objs = ['ebb.o', 'ebb_ruby.o', 'parser.o']
0
 
0
 dir_config('ebb_ext')
0
 create_makefile('ebb_ext')