ebb 0.2.0 → 0.2.1

data/src/ebb.c

@@ -42,12 +42,12 @@ void env_add(ebb_client *client, const char *field, int flen, const char *value,
     client->parser.overflow_error = TRUE;
     return;
   }
-  client->env[client->env_size].type = -1;
-  client->env[client->env_size].field = field;
-  client->env[client->env_size].field_length = flen;
-  client->env[client->env_size].value = value;
-  client->env[client->env_size].value_length = vlen;
-  client->env_size += 1;
+  struct ebb_env_item * const item = &client->env[client->env_size++];
+  item->type = -1;
+  item->field_length = flen;
+  item->value_length = vlen;
+  item->field = field;
+  item->value = value;
 }
 
 
@@ -57,12 +57,12 @@ void env_add_const(ebb_client *client, int type, const char *value, int vlen)
     client->parser.overflow_error = TRUE;
     return;
   }
-  client->env[client->env_size].type = type;
-  client->env[client->env_size].field = NULL;
-  client->env[client->env_size].field_length = -1;
-  client->env[client->env_size].value = value;
-  client->env[client->env_size].value_length = vlen;
-  client->env_size += 1;
+  struct ebb_env_item * const item = &client->env[client->env_size++];
+  item->type = type;
+  item->field_length = -1;
+  item->value_length = vlen;
+  item->field = NULL;
+  item->value = value;
 }
 
 
@@ -226,7 +226,7 @@ static void client_init(ebb_client *client)
    */
   if(!client->open) {
     /* DO SOCKET STUFF */
-    socklen_t len;
+    socklen_t len = sizeof(struct sockaddr); 
     int fd = accept(client->server->fd, (struct sockaddr*)&(client->sockaddr), &len);
     if(fd < 0) {
       perror("accept()");
@@ -276,7 +276,7 @@ static void client_init(ebb_client *client)
   ev_io_start(client->server->loop, &client->read_watcher);
   
   client->timeout_watcher.data = client;  
-  ev_timer_init(&client->timeout_watcher, on_timeout, EBB_TIMEOUT, EBB_TIMEOUT);
+  ev_timer_init(&client->timeout_watcher, on_timeout, EBB_TIMEOUT, 0);
   ev_timer_start(client->server->loop, &client->timeout_watcher);
 }
 
@@ -299,7 +299,7 @@ static void on_request(struct ev_loop *loop, ev_io *watcher, int revents)
    * until the request is complete and parsed.
    */
   int i;
-  ebb_client *client;
+  ebb_client *client = NULL;
   /* Get next availible peer */
   for(i=0; i < EBB_MAX_CLIENTS; i++)
     if(!server->clients[i].in_use && !server->clients[i].open) {

data/src/ebb.h

@@ -13,7 +13,7 @@
 
 typedef struct ebb_server ebb_server;
 typedef struct ebb_client ebb_client;
-#define EBB_VERSION "0.2.0"
+#define EBB_VERSION "0.2.1"
 #define EBB_BUFFERSIZE (1024 * (80 + 33))
 #define EBB_MAX_CLIENTS 1024
 #define EBB_TIMEOUT 30.0
@@ -35,10 +35,10 @@ void ebb_client_write_body(ebb_client*, const char *data, int length);
 
 struct ebb_env_item {
   int type;
-  const char *field;
   int field_length;
-  const char *value;
   int value_length;
+  const char *field;
+  const char *value;
 };
 
 struct ebb_client {

data/src/ebb_ruby.c

@@ -58,7 +58,7 @@ static void detach_idle_watcher()
 }
 
 
-void request_cb(ebb_client *client, void *data)
+static void request_cb(ebb_client *client, void *data)
 {
   VALUE rb_client = Data_Wrap_Struct(cClient, 0, 0, client);
   
@@ -71,21 +71,21 @@ void request_cb(ebb_client *client, void *data)
   attach_idle_watcher();
 }
 
-VALUE server_listen_on_fd(VALUE _, VALUE sfd)
+static VALUE server_listen_on_fd(VALUE _, VALUE sfd)
 {
   if(ebb_server_listen_on_fd(server, FIX2INT(sfd)) < 0)
     rb_sys_fail("Problem listening on FD");
   return Qnil;
 }
 
-VALUE server_listen_on_port(VALUE _, VALUE port)
+static VALUE server_listen_on_port(VALUE _, VALUE port)
 {
   if(ebb_server_listen_on_port(server, FIX2INT(port)) < 0)
     rb_sys_fail("Problem listening on port");
   return Qnil;
 }
 
-VALUE server_listen_on_unix_socket(VALUE _, VALUE socketfile)
+static VALUE server_listen_on_unix_socket(VALUE _, VALUE socketfile)
 {
   if(ebb_server_listen_on_unix_socket(server, StringValuePtr(socketfile)) < 0)
     rb_sys_fail("Problem listening on unix socket");
@@ -93,7 +93,7 @@ VALUE server_listen_on_unix_socket(VALUE _, VALUE socketfile)
 }
 
 
-static struct timeval idle_timeout = { tv_sec: 0, tv_usec: 50000 };
+static struct timeval idle_timeout = { 0, 50000 };
 
 static void
 idle_cb (struct ev_loop *loop, struct ev_idle *w, int revents) {
@@ -132,7 +132,7 @@ idle_cb (struct ev_loop *loop, struct ev_idle *w, int revents) {
   }
 }
 
-VALUE server_process_connections(VALUE _)
+static VALUE server_process_connections(VALUE _)
 {
   TRAP_BEG;
   ev_loop(loop, EVLOOP_ONESHOT);
@@ -141,23 +141,23 @@ VALUE server_process_connections(VALUE _)
 }
 
 
-VALUE server_unlisten(VALUE _)
+static VALUE server_unlisten(VALUE _)
 {
   ebb_server_unlisten(server);
   return Qnil;
 }
 
-VALUE server_open(VALUE _)
+static VALUE server_open(VALUE _)
 {
   return server->open ? Qtrue : Qfalse;
 }
 
-VALUE server_waiting_clients(VALUE _)
+static VALUE server_waiting_clients(VALUE _)
 {
   return waiting_clients;
 }
 
-VALUE env_field(struct ebb_env_item *item)
+static VALUE env_field(struct ebb_env_item *item)
 {
   if(item->field) {
     VALUE f = rb_str_new(NULL, RSTRING_LEN(global_http_prefix) + item->field_length);
@@ -188,7 +188,7 @@ VALUE env_field(struct ebb_env_item *item)
 }
 
 
-VALUE env_value(struct ebb_env_item *item)
+static VALUE env_value(struct ebb_env_item *item)
 {
   if(item->value_length > 0)
     return rb_str_new(item->value, item->value_length);
@@ -197,16 +197,18 @@ VALUE env_value(struct ebb_env_item *item)
 }
 
 
-VALUE client_env(VALUE _, VALUE rb_client)
+static VALUE client_env(VALUE _, VALUE rb_client)
 {
   ebb_client *client;
   VALUE field, value, env = rb_hash_new();
   int i;
+  struct ebb_env_item *item;
   
   Data_Get_Struct(rb_client, ebb_client, client);
   for(i=0; i < client->env_size; i++) {
-    field = env_field(&client->env[i]);
-    value = env_value(&client->env[i]);
+    item = &client->env[i];
+    field = env_field(item);
+    value = env_value(item);
     rb_hash_aset(env, field, value);
   }
   
@@ -220,7 +222,7 @@ VALUE client_env(VALUE _, VALUE rb_client)
   return env;
 }
 
-VALUE client_write_status(VALUE _, VALUE client, VALUE status, VALUE reason_phrase)
+static VALUE client_write_status(VALUE _, VALUE client, VALUE status, VALUE reason_phrase)
 {
   ebb_client *_client;
   Data_Get_Struct(client, ebb_client, _client);
@@ -228,7 +230,7 @@ VALUE client_write_status(VALUE _, VALUE client, VALUE status, VALUE reason_phra
   return Qnil;
 }
 
-VALUE client_write_header(VALUE _, VALUE client, VALUE field, VALUE value)
+static VALUE client_write_header(VALUE _, VALUE client, VALUE field, VALUE value)
 {
   ebb_client *_client;
   Data_Get_Struct(client, ebb_client, _client);
@@ -236,7 +238,7 @@ VALUE client_write_header(VALUE _, VALUE client, VALUE field, VALUE value)
   return Qnil;
 }
 
-VALUE client_write_body(VALUE _, VALUE client, VALUE string)
+static VALUE client_write_body(VALUE _, VALUE client, VALUE string)
 {
   ebb_client *_client;
   Data_Get_Struct(client, ebb_client, _client);
@@ -245,7 +247,7 @@ VALUE client_write_body(VALUE _, VALUE client, VALUE string)
 }
 
 
-VALUE client_release(VALUE _, VALUE rb_client)
+static VALUE client_release(VALUE _, VALUE rb_client)
 {
   ebb_client *client;
   Data_Get_Struct(rb_client, ebb_client, client);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebb
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - ry dahl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-19 00:00:00 +02:00
+date: 2008-07-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,34 +34,34 @@ files:
 - src/ebb.h
 - src/parser.c
 - src/parser.h
-- libev/ev.c
-- libev/ev.h
 - libev/ev_epoll.c
-- libev/ev_kqueue.c
+- libev/ev_select.c
+- libev/ev.h
+- libev/ev_wrap.h
 - libev/ev_poll.c
+- libev/ev.c
 - libev/ev_port.c
-- libev/ev_select.c
-- libev/ev_vars.h
+- libev/ev_kqueue.c
 - libev/ev_win32.c
-- libev/ev_wrap.h
+- libev/ev_vars.h
 - README
 - src/ebb_ruby.c
 - src/extconf.rb
 - ruby_lib/ebb
+- ruby_lib/ebb/runner.rb
 - ruby_lib/ebb/runner
 - ruby_lib/ebb/runner/rails.rb
-- ruby_lib/ebb/runner.rb
-- ruby_lib/ebb.rb
 - ruby_lib/rack
 - ruby_lib/rack/adapter
 - ruby_lib/rack/adapter/rails.rb
-- benchmark/application.rb
+- ruby_lib/ebb.rb
 - benchmark/server_test.rb
+- benchmark/application.rb
 - bin/ebb_rails
 - test/basic_test.rb
-- test/ebb_rails_test.rb
 - test/env_test.rb
 - test/helper.rb
+- test/ebb_rails_test.rb
 has_rdoc: false
 homepage: http://ebb.rubyforge.org
 post_install_message: 
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ebb
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A Web Server