cool.io 1.2.4 → 1.3.0

data/ext/libev/ev.h

@@ -205,7 +205,7 @@ struct ev_loop;
 /*****************************************************************************/
 
 #define EV_VERSION_MAJOR 4
-#define EV_VERSION_MINOR 15
+#define EV_VERSION_MINOR 19
 
 /* eventmask, revents, events... */
 enum {
@@ -658,8 +658,10 @@ EV_API_DECL void ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval) EV_T
 /* advanced stuff for threading etc. support, see docs */
 EV_API_DECL void ev_set_userdata (EV_P_ void *data) EV_THROW;
 EV_API_DECL void *ev_userdata (EV_P) EV_THROW;
-EV_API_DECL void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW;
-EV_API_DECL void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P) EV_THROW) EV_THROW;
+typedef void (*ev_loop_callback)(EV_P);
+EV_API_DECL void ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW;
+/* C++ doesn't allow the use of the ev_loop_callback typedef here, so we need to spell it out*/
+EV_API_DECL void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW;
 
 EV_API_DECL unsigned int ev_pending_count (EV_P) EV_THROW; /* number of pending events, if any */
 EV_API_DECL void ev_invoke_pending (EV_P); /* invoke all pending watchers */
@@ -730,7 +732,7 @@ EV_API_DECL void ev_resume  (EV_P) EV_THROW;
 #endif
 
 /* stopping (enabling, adding) a watcher does nothing if it is already running */
-/* stopping (disabling, deleting) a watcher does nothing unless its already running */
+/* stopping (disabling, deleting) a watcher does nothing unless it's already running */
 #if EV_PROTOTYPES
 
 /* feeds an event into a watcher as if the event actually occurred */

data/ext/libev/ev_epoll.c

@@ -228,7 +228,10 @@ epoll_poll (EV_P_ ev_tstamp timeout)
       if (anfds [fd].emask & EV_EMASK_EPERM && events)
         fd_event (EV_A_ fd, events);
       else
-        epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+        {
+          epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+          anfds [fd].emask = 0;
+        }
     }
 }
 

data/ext/libev/ev_kqueue.c

@@ -1,7 +1,7 @@
 /*
  * libev kqueue backend
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-

data/ext/libev/ev_vars.h

@@ -1,7 +1,7 @@
 /*
  * loop member variable declarations
  *
- * Copyright (c) 2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010,2011,2012,2013 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -194,9 +194,10 @@ VARx(unsigned int, loop_count) /* total number of loop iterations/blocks */
 VARx(unsigned int, loop_depth) /* #ev_run enters - #ev_run leaves */
 
 VARx(void *, userdata)
+/* C++ doesn't support the ev_loop_callback typedef here. stinks. */
 VAR (release_cb, void (*release_cb)(EV_P) EV_THROW)
 VAR (acquire_cb, void (*acquire_cb)(EV_P) EV_THROW)
-VAR (invoke_cb , void (*invoke_cb) (EV_P))
+VAR (invoke_cb , ev_loop_callback invoke_cb)
 #endif
 
 #undef VARx

data/ext/libev/ev_win32.c

@@ -143,7 +143,7 @@ fail:
 
 #undef pipe
 #define pipe(filedes) ev_pipe (filedes)
-  
+
 #define EV_HAVE_EV_TIME 1
 ev_tstamp
 ev_time (void)

data/ext/libev/win_select.patch

@@ -0,0 +1,115 @@
+diff --git a/ext/libev/ev_select.c b/ext/libev/ev_select.c
+index f38d6ca..3a32642 100644
+--- a/ext/libev/ev_select.c
++++ b/ext/libev/ev_select.c
+@@ -67,6 +67,53 @@
+ 
+ #include <string.h>
+ 
++#ifdef _WIN32
++/*
++########## COOLIO PATCHERY HO! ##########
++
++Ruby undefs FD_* utilities for own implementation.
++It converts fd argument into socket handle internally on Windows,
++so libev should not use Ruby's FD_* utilities.
++
++Following FD_* utilities come from MinGW.
++RubyInstaller is built by MinGW so this should work.
++*/
++int PASCAL __WSAFDIsSet(SOCKET,fd_set*);
++#define EV_WIN_FD_CLR(fd,set) do { u_int __i;\
++for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
++	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
++	while (__i < ((fd_set *)(set))->fd_count-1) {\
++		((fd_set*)(set))->fd_array[__i] = ((fd_set*)(set))->fd_array[__i+1];\
++		__i++;\
++	}\
++	((fd_set*)(set))->fd_count--;\
++	break;\
++	}\
++}\
++} while (0)
++#define EV_WIN_FD_SET(fd, set) do { u_int __i;\
++for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
++	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
++		break;\
++	}\
++}\
++if (__i == ((fd_set *)(set))->fd_count) {\
++	if (((fd_set *)(set))->fd_count < FD_SETSIZE) {\
++		((fd_set *)(set))->fd_array[__i] = (fd);\
++		((fd_set *)(set))->fd_count++;\
++	}\
++}\
++} while(0)
++#define EV_WIN_FD_ZERO(set) (((fd_set *)(set))->fd_count=0)
++#define EV_WIN_FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set *)(set))
++/* ######################################## */
++#else
++#define EV_WIN_FD_CLR FD_CLR
++#define EV_WIN_FD_SET FD_SET
++#define EV_WIN_FD_ZERO FD_ZERO
++#define EV_WIN_FD_ISSET FD_ISSET
++#endif
++
+ static void
+ select_modify (EV_P_ int fd, int oev, int nev)
+ {
+@@ -91,17 +138,17 @@ select_modify (EV_P_ int fd, int oev, int nev)
+     if ((oev ^ nev) & EV_READ)
+     #endif
+       if (nev & EV_READ)
+-        FD_SET (handle, (fd_set *)vec_ri);
++        EV_WIN_FD_SET (handle, (fd_set *)vec_ri);
+       else
+-        FD_CLR (handle, (fd_set *)vec_ri);
++        EV_WIN_FD_CLR (handle, (fd_set *)vec_ri);
+ 
+     #if EV_SELECT_IS_WINSOCKET
+     if ((oev ^ nev) & EV_WRITE)
+     #endif
+       if (nev & EV_WRITE)
+-        FD_SET (handle, (fd_set *)vec_wi);
++        EV_WIN_FD_SET (handle, (fd_set *)vec_wi);
+       else
+-        FD_CLR (handle, (fd_set *)vec_wi);
++        EV_WIN_FD_CLR (handle, (fd_set *)vec_wi);
+ 
+ #else
+ 
+@@ -136,6 +183,8 @@ select_modify (EV_P_ int fd, int oev, int nev)
+   }
+ }
+ 
++#undef socket
++
+ static void
+ select_poll (EV_P_ ev_tstamp timeout)
+ {
+@@ -230,10 +279,10 @@ select_poll (EV_P_ ev_tstamp timeout)
+           int handle = fd;
+           #endif
+ 
+-          if (FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
+-          if (FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
++          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_ro)) events |= EV_READ;
++          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_wo)) events |= EV_WRITE;
+           #ifdef _WIN32
+-          if (FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
++          if (EV_WIN_FD_ISSET (handle, (fd_set *)vec_eo)) events |= EV_WRITE;
+           #endif
+ 
+           if (expect_true (events))
+@@ -279,9 +328,9 @@ select_init (EV_P_ int flags)
+   backend_poll    = select_poll;
+ 
+ #if EV_SELECT_USE_FD_SET
+-  vec_ri  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_ri);
++  vec_ri  = ev_malloc (sizeof (fd_set)); EV_WIN_FD_ZERO ((fd_set *)vec_ri);
+   vec_ro  = ev_malloc (sizeof (fd_set));
+-  vec_wi  = ev_malloc (sizeof (fd_set)); FD_ZERO ((fd_set *)vec_wi);
++  vec_wi  = ev_malloc (sizeof (fd_set)); EV_WIN_FD_ZERO ((fd_set *)vec_wi);
+   vec_wo  = ev_malloc (sizeof (fd_set));
+   #ifdef _WIN32
+   vec_eo  = ev_malloc (sizeof (fd_set));

data/lib/cool.io.rb

@@ -19,8 +19,6 @@ require "cool.io/listener"
 require "cool.io/dns_resolver"
 require "cool.io/socket"
 require "cool.io/server"
-require "cool.io/http_client"
-require "cool.io/dsl"
 
 module Coolio
   def self.inspect

data/lib/cool.io/io.rb

@@ -98,11 +98,6 @@ module Coolio
       data.size
     end
 
-    # Number of bytes are currently in the output buffer
-    def output_buffer_size
-      @_write_buffer.size
-    end
-
     # Close the IO stream
     def close
       detach if attached?

data/lib/cool.io/meta.rb

@@ -39,7 +39,7 @@ module Coolio
             end
 
             if defined? @#{method}_callback and @#{method}_callback
-              instance_exec(*args, &@#{method}_callback)
+              @#{method}_callback.call(*args)
             end
           end
         EOD

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.2.4"
+  VERSION = "1.3.0"
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -61,7 +61,6 @@ email:
 executables: []
 extensions:
 - ext/cool.io/extconf.rb
-- ext/http11_client/extconf.rb
 - ext/iobuffer/extconf.rb
 extra_rdoc_files: []
 files:
@@ -74,12 +73,12 @@ files:
 - README.md
 - Rakefile
 - cool.io.gemspec
+- examples/callbacked_echo_server.rb
 - examples/dslified_echo_client.rb
 - examples/dslified_echo_server.rb
 - examples/echo_client.rb
 - examples/echo_server.rb
 - examples/google.rb
-- examples/httpclient.rb
 - ext/cool.io/.gitignore
 - ext/cool.io/cool.io.h
 - ext/cool.io/cool.io_ext.c
@@ -93,14 +92,6 @@ files:
 - ext/cool.io/utils.c
 - ext/cool.io/watcher.c
 - ext/cool.io/watcher.h
-- ext/http11_client/.gitignore
-- ext/http11_client/LICENSE
-- ext/http11_client/ext_help.h
-- ext/http11_client/extconf.rb
-- ext/http11_client/http11_client.c
-- ext/http11_client/http11_parser.c
-- ext/http11_client/http11_parser.h
-- ext/http11_client/http11_parser.rl
 - ext/iobuffer/extconf.rb
 - ext/iobuffer/iobuffer.c
 - ext/libev/Changes
@@ -119,14 +110,13 @@ files:
 - ext/libev/ev_wrap.h
 - ext/libev/ruby_gil.patch
 - ext/libev/test_libev_win32.c
+- ext/libev/win_select.patch
 - lib/.gitignore
 - lib/cool.io.rb
 - lib/cool.io/async_watcher.rb
 - lib/cool.io/custom_require.rb
 - lib/cool.io/dns_resolver.rb
 - lib/cool.io/dsl.rb
-- lib/cool.io/eventmachine.rb
-- lib/cool.io/http_client.rb
 - lib/cool.io/io.rb
 - lib/cool.io/iowatcher.rb
 - lib/cool.io/listener.rb
@@ -165,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby

data/examples/httpclient.rb

@@ -1,38 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-
-require 'rubygems'
-require 'cool.io'
-
-class MyHttpClient < Coolio::HttpClient
-  def on_connect
-    super
-    STDERR.puts "Connected to #{remote_host}:#{remote_port}"
-  end
-
-  def on_connect_failed
-    super
-    STDERR.puts "Connection failed"
-  end
-
-  def on_response_header(header)
-    STDERR.puts "Response: #{header.http_version} #{header.status} #{header.http_reason}"
-  end
-
-  def on_body_data(data)
-    STDOUT.write data
-    STDOUT.flush
-  end
-
-  def on_request_complete
-    STDERR.puts "Request complete!"
-  end
-
-  def on_error(reason)
-    STDERR.puts "Error: #{reason}"
-  end
-end
-
-l = Coolio::Loop.default
-c = MyHttpClient.connect("www.google.com", 80).attach(l)
-c.request('GET', '/search', :query => { :q => 'foobar' })
-l.run

data/ext/http11_client/.gitignore

@@ -1,5 +0,0 @@
-Makefile
-mkmf.log
-*.o
-*.so
-*.bundle

data/ext/http11_client/LICENSE

@@ -1,31 +0,0 @@
-Copyright (c) 2010, Zed A. Shaw and Mongrel2 Project Contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the Mongrel2 Project, Zed A. Shaw, nor the names
-      of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written
-      permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

data/ext/http11_client/ext_help.h

@@ -1,14 +0,0 @@
-#ifndef ext_help_h
-#define ext_help_h
-
-#define RAISE_NOT_NULL(T) if(T == NULL) rb_raise(rb_eArgError, "NULL found for " # T " when shouldn't be.");
-#define DATA_GET(from,type,name) Data_Get_Struct(from,type,name); RAISE_NOT_NULL(name);
-#define REQUIRE_TYPE(V, T) if(TYPE(V) != T) rb_raise(rb_eTypeError, "Wrong argument type for " # V " required " # T);
-
-#ifdef DEBUG
-#define TRACE()  fprintf(stderr, "> %s:%d:%s\n", __FILE__, __LINE__, __FUNCTION__)
-#else
-#define TRACE() 
-#endif
-
-#endif

data/ext/http11_client/extconf.rb

@@ -1,6 +0,0 @@
-require 'mkmf'
-
-dir_config("http11_client")
-have_library("c", "main")
-
-create_makefile("http11_client")

data/ext/http11_client/http11_client.c

@@ -1,300 +0,0 @@
-/**
- * Copyright (c) 2005 Zed A. Shaw
- * You can redistribute it and/or modify it under the same terms as Ruby.
- */
-
-#include "ruby.h"
-#include "ext_help.h"
-#include <assert.h>
-#include <string.h>
-#include "http11_parser.h"
-#include <ctype.h>
-
-static VALUE mCoolio;
-static VALUE cHttpClientParser;
-static VALUE eHttpClientParserError;
-
-#define  id_reason rb_intern("@http_reason")
-#define  id_status rb_intern("@http_status")
-#define  id_version rb_intern("@http_version")
-#define  id_body rb_intern("@http_body")
-#define  id_chunk_size rb_intern("@http_chunk_size")
-#define  id_last_chunk rb_intern("@last_chunk")
-
-void client_http_field(void *data, const char *field, size_t flen, const char *value, size_t vlen)
-{
-  char *ch, *end;
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-  VALUE f = Qnil;
-
-  v = rb_str_new(value, vlen);
-  f = rb_str_new(field, flen);
-
-  /* Yes Children, rb_str_upcase_bang isn't even available as an intern.h function.
-   * how incredibly handy to not have that.  Nope, I have to do it by hand.*/
-  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
-    if(*ch == '-') {
-      *ch = '_';
-    } else {
-      *ch = toupper(*ch);
-    }
-  }
-
-  rb_hash_aset(req, f, v);
-}
-
-void client_reason_phrase(void *data, const char *at, size_t length)
-{
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-
-  v = rb_str_new(at, length);
-
-  rb_ivar_set(req, id_reason, v);
-}
-
-void client_status_code(void *data, const char *at, size_t length)
-{
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-
-  v = rb_str_new(at, length);
-
-  rb_ivar_set(req, id_status, v);
-}
-
-void client_http_version(void *data, const char *at, size_t length)
-{
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-
-  v = rb_str_new(at, length);
-
-  rb_ivar_set(req, id_version, v);
-}
-
-/** Finalizes the request header to have a bunch of stuff that's
-  needed. */
-void client_header_done(void *data, const char *at, size_t length)
-{
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-
-  v = rb_str_new(at, length);
-  rb_ivar_set(req, id_body, v);
-}
-
-void client_chunk_size(void *data, const char *at, size_t length)
-{
-  VALUE req = (VALUE)data;
-  VALUE v = Qnil;
-
-  if(length <= 0) {
-    rb_raise(eHttpClientParserError, "Chunked Encoding gave <= 0 chunk size.");
-  }
-
-  v = rb_str_new(at, length);
-
-  rb_ivar_set(req, id_chunk_size, v);
-}
-
-void client_last_chunk(void *data, const char *at, size_t length) {
-  VALUE req = (VALUE)data;
-  rb_ivar_set(req, id_last_chunk,Qtrue);
-}
-
-
-void HttpClientParser_free(void *data) {
-  TRACE();
-
-  if(data) {
-    free(data);
-  }
-}
-
-
-VALUE HttpClientParser_alloc(VALUE klass)
-{
-  VALUE obj;
-  httpclient_parser *hp = ALLOC_N(httpclient_parser, 1);
-  TRACE();
-  hp->http_field = client_http_field;
-  hp->status_code = client_status_code;
-  hp->reason_phrase = client_reason_phrase;
-  hp->http_version = client_http_version;
-  hp->header_done = client_header_done;
-  hp->chunk_size = client_chunk_size;
-  hp->last_chunk = client_last_chunk;
-  httpclient_parser_init(hp);
-
-  obj = Data_Wrap_Struct(klass, NULL, HttpClientParser_free, hp);
-
-  return obj;
-}
-
-
-/**
- * call-seq:
- *    parser.new -> parser
- *
- * Creates a new parser.
- */
-VALUE HttpClientParser_init(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-  httpclient_parser_init(http);
-
-  return self;
-}
-
-
-/**
- * call-seq:
- *    parser.reset -> nil
- *
- * Resets the parser to it's initial state so that you can reuse it
- * rather than making new ones.
- */
-VALUE HttpClientParser_reset(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-  httpclient_parser_init(http);
-
-  return Qnil;
-}
-
-
-/**
- * call-seq:
- *    parser.finish -> true/false
- *
- * Finishes a parser early which could put in a "good" or bad state.
- * You should call reset after finish it or bad things will happen.
- */
-VALUE HttpClientParser_finish(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-  httpclient_parser_finish(http);
-
-  return httpclient_parser_is_finished(http) ? Qtrue : Qfalse;
-}
-
-
-/**
- * call-seq:
- *    parser.execute(req_hash, data, start) -> Integer
- *
- * Takes a Hash and a String of data, parses the String of data filling in the Hash
- * returning an Integer to indicate how much of the data has been read.  No matter
- * what the return value, you should call HttpClientParser#finished? and HttpClientParser#error?
- * to figure out if it's done parsing or there was an error.
- * 
- * This function now throws an exception when there is a parsing error.  This makes 
- * the logic for working with the parser much easier.  You can still test for an 
- * error, but now you need to wrap the parser with an exception handling block.
- *
- * The third argument allows for parsing a partial request and then continuing
- * the parsing from that position.  It needs all of the original data as well 
- * so you have to append to the data buffer as you read.
- */
-VALUE HttpClientParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
-{
-  httpclient_parser *http = NULL;
-  int from = 0;
-  char *dptr = NULL;
-  long dlen = 0;
-
-  REQUIRE_TYPE(req_hash, T_HASH);
-  REQUIRE_TYPE(data, T_STRING);
-  REQUIRE_TYPE(start, T_FIXNUM);
-
-  DATA_GET(self, httpclient_parser, http);
-
-  from = FIX2INT(start);
-  dptr = RSTRING_PTR(data);
-  dlen = RSTRING_LEN(data);
-
-  if(from >= dlen) {
-    rb_raise(eHttpClientParserError, "Requested start is after data buffer end.");
-  } else {
-    http->data = (void *)req_hash;
-    httpclient_parser_execute(http, dptr, dlen, from);
-
-    if(httpclient_parser_has_error(http)) {
-      rb_raise(eHttpClientParserError, "Invalid HTTP format, parsing fails.");
-    } else {
-      return INT2FIX(httpclient_parser_nread(http));
-    }
-  }
-}
-
-
-
-/**
- * call-seq:
- *    parser.error? -> true/false
- *
- * Tells you whether the parser is in an error state.
- */
-VALUE HttpClientParser_has_error(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-
-  return httpclient_parser_has_error(http) ? Qtrue : Qfalse;
-}
-
-
-/**
- * call-seq:
- *    parser.finished? -> true/false
- *
- * Tells you whether the parser is finished or not and in a good state.
- */
-VALUE HttpClientParser_is_finished(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-
-  return httpclient_parser_is_finished(http) ? Qtrue : Qfalse;
-}
-
-
-/**
- * call-seq:
- *    parser.nread -> Integer
- *
- * Returns the amount of data processed so far during this processing cycle.  It is
- * set to 0 on initialize or reset calls and is incremented each time execute is called.
- */
-VALUE HttpClientParser_nread(VALUE self)
-{
-  httpclient_parser *http = NULL;
-  DATA_GET(self, httpclient_parser, http);
-
-  return INT2FIX(http->nread);
-}
-
-
-
-void Init_http11_client()
-{
-
-  mCoolio = rb_define_module("Coolio");
-
-  eHttpClientParserError = rb_define_class_under(mCoolio, "HttpClientParserError", rb_eIOError);
-
-  cHttpClientParser = rb_define_class_under(mCoolio, "HttpClientParser", rb_cObject);
-  rb_define_alloc_func(cHttpClientParser, HttpClientParser_alloc);
-  rb_define_method(cHttpClientParser, "initialize", HttpClientParser_init,0);
-  rb_define_method(cHttpClientParser, "reset", HttpClientParser_reset,0);
-  rb_define_method(cHttpClientParser, "finish", HttpClientParser_finish,0);
-  rb_define_method(cHttpClientParser, "execute", HttpClientParser_execute,3);
-  rb_define_method(cHttpClientParser, "error?", HttpClientParser_has_error,0);
-  rb_define_method(cHttpClientParser, "finished?", HttpClientParser_is_finished,0);
-  rb_define_method(cHttpClientParser, "nread", HttpClientParser_nread,0);
-}