em-http-request 0.2.15 → 0.3.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.bundle
 *.o
 Makefile
-mkmf.log
+mkmf.log
+Gemfile.lock

data/Changelog.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.3.0 / 2011-01-15
+
+- IMPORTANT: default to non-persistent connections (timeout => 0 now requires :keepalive => true)
+- see: https://github.com/igrigorik/em-http-request/commit/1ca5b608e876c18fa6cfa318d0685dcf5b974e09
+
+- added escape_utils dependency to fix slow encode on long string escapes
+
+- bugfix: proxy authorization headers
+- bugfix: default to Encoding.default_external on invalid encoding in response
+- bugfix: do not normalize URI's internally
+- bugfix: more robust Encoding detection
+
+
 ## 0.2.15 / 2010-11-18
 
 - bugfix: follow redirects on missing content-length

data/Gemfile

@@ -1,15 +1,3 @@
-source :gemcutter
+source "http://rubygems.org"
 
-gem 'eventmachine', '~> 0.12.9'
-gem 'addressable', '~> 2.0.0'
-gem 'rack'
-
-gem 'mongrel', '~> 1.2.0.pre2', :require => ['mongrel', 'http11']
-
-group :development do
-  gem 'autotest'
-  gem 'ruby-debug19', :require => 'ruby-debug'
-  gem 'jeweler'
-  gem 'rspec', '~> 2.0.0'
-  gem 'em-websocket'
-end
+gemspec

data/README.md

@@ -86,6 +86,8 @@ Full basic author support. For OAuth, check examples/oauth-tweet.rb file.
 POSTing data example
 --------------------
 
+For multi-part uploads, please see [this gist](https://gist.github.com/778639).
+
       EventMachine.run {
         http1 = EventMachine::HttpRequest.new('http://www.website.com/').post :body => {"key1" => 1, "key2" => [2,3]}
         http2 = EventMachine::HttpRequest.new('http://www.website.com/').post :body => "some data"
@@ -166,3 +168,8 @@ WebSocket example
 
         http.disconnect { puts "oops, dropped connection?" }
       }
+
+License
+-------
+
+(MIT License) - Copyright (c) 2011 Ilya Grigorik

data/Rakefile

@@ -1,11 +1,13 @@
 require 'bundler'
+
 Bundler.setup
 Bundler.require :default, :development
 
 require 'rake'
 require 'rake/clean'
-require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
+
 require 'fileutils'
 include FileUtils
 
@@ -19,15 +21,6 @@ end
 # Default Rake task is compile
 task :default => :compile
 
-# RDoc
-Rake::RDocTask.new(:rdoc) do |task|
-  task.rdoc_dir = 'doc'
-  task.title    = 'EventMachine::HttpRequest'
-  task.options = %w(--title HttpRequest --main README.md --line-numbers)
-  task.rdoc_files.include(['lib/**/*.rb'])
-  task.rdoc_files.include(['README.md', 'LICENSE'])
-end
-
 # Rebuild parser Ragel
 task :ragel do
   Dir.chdir "ext/http11_client" do
@@ -38,8 +31,8 @@ task :ragel do
   end
 end
 
-require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:spec)
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)
 
 def make(makedir)
   Dir.chdir(makedir) { sh MAKE }
@@ -84,26 +77,4 @@ setup_extension("http11_client", "http11_client")
 task :compile => [:em_buffer, :http11_client]
 
 CLEAN.include ['build/*', '**/*.o', '**/*.so', '**/*.a', '**/*.log', 'pkg']
-CLEAN.include ['ext/buffer/Makefile', 'lib/em_buffer.*', 'lib/http11_client.*']
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "em-http-request"
-    gemspec.summary = "EventMachine based, async HTTP Request interface"
-    gemspec.description = gemspec.summary
-    gemspec.email = "ilya@igvita.com"
-    gemspec.homepage = "http://github.com/igrigorik/em-http-request"
-    gemspec.authors = ["Ilya Grigorik"]
-    gemspec.required_ruby_version = ">= 1.8.6"
-    gemspec.extensions = ["ext/buffer/extconf.rb" , "ext/http11_client/extconf.rb"]
-    gemspec.add_dependency('eventmachine', '>= 0.12.9')
-    gemspec.add_dependency('addressable', '>= 2.0.0')
-    gemspec.rubyforge_project = "em-http-request"
-    gemspec.files = FileList[`git ls-files`.split]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+CLEAN.include ['ext/buffer/Makefile', 'lib/em_buffer.*', 'lib/http11_client.*']

data/em-http-request.gemspec

@@ -1,101 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "em-http/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{em-http-request}
-  s.version = "0.2.15"
+  s.name        = "em-http-request"
+  s.version     = EventMachine::HttpRequest::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Ilya Grigorik"]
+  s.email       = ["ilya@igvita.com"]
+  s.homepage    = "http://github.com/igrigorik/em-http-request"
+  s.summary     = "EventMachine based, async HTTP Request client"
+  s.description = s.summary
+  s.rubyforge_project = "em-http-request"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ilya Grigorik"]
-  s.date = %q{2010-10-06}
-  s.description = %q{EventMachine based, async HTTP Request interface}
-  s.email = %q{ilya@igvita.com}
-  s.extensions = ["ext/buffer/extconf.rb", "ext/http11_client/extconf.rb"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "Changelog.md",
-     "Gemfile",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "autotest/discover.rb",
-     "em-http-request.gemspec",
-     "examples/fetch.rb",
-     "examples/fibered-http.rb",
-     "examples/oauth-tweet.rb",
-     "examples/socks5.rb",
-     "examples/websocket-handler.rb",
-     "examples/websocket-server.rb",
-     "ext/buffer/em_buffer.c",
-     "ext/buffer/extconf.rb",
-     "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",
-     "lib/em-http-request.rb",
-     "lib/em-http.rb",
-     "lib/em-http/client.rb",
-     "lib/em-http/core_ext/bytesize.rb",
-     "lib/em-http/decoders.rb",
-     "lib/em-http/http_options.rb",
-     "lib/em-http/mock.rb",
-     "lib/em-http/multi.rb",
-     "lib/em-http/request.rb",
-     "spec/encoding_spec.rb",
-     "spec/fixtures/google.ca",
-     "spec/helper.rb",
-     "spec/mock_spec.rb",
-     "spec/multi_spec.rb",
-     "spec/request_spec.rb",
-     "spec/stallion.rb",
-     "spec/stub_server.rb"
-  ]
-  s.homepage = %q{http://github.com/igrigorik/em-http-request}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
-  s.rubyforge_project = %q{em-http-request}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{EventMachine based, async HTTP Request interface}
-  s.test_files = [
-    "spec/encoding_spec.rb",
-     "spec/helper.rb",
-     "spec/mock_spec.rb",
-     "spec/multi_spec.rb",
-     "spec/request_spec.rb",
-     "spec/stallion.rb",
-     "spec/stub_server.rb",
-     "examples/fetch.rb",
-     "examples/fibered-http.rb",
-     "examples/oauth-tweet.rb",
-     "examples/socks5.rb",
-     "examples/websocket-handler.rb",
-     "examples/websocket-server.rb"
-  ]
+  s.add_dependency "eventmachine", ">= 0.12.9"
+  s.add_dependency "addressable", ">= 2.0.0"
+  s.add_dependency "escape_utils"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "em-websocket"
+  s.add_development_dependency "rack"
+  s.add_development_dependency "mongrel", "~> 1.2.0.pre2"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_runtime_dependency(%q<addressable>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-      s.add_dependency(%q<addressable>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.9"])
-    s.add_dependency(%q<addressable>, [">= 2.0.0"])
-  end
-end
+  s.extensions = ["ext/buffer/extconf.rb", "ext/http11_client/extconf.rb"]
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/ext/buffer/extconf.rb

@@ -1,53 +1,53 @@
-require 'mkmf'
-
-libs = []
-
-$defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
-
-if have_func('rb_thread_blocking_region')
-  $defs << '-DHAVE_RB_THREAD_BLOCKING_REGION'
-end
-
-if have_func('rb_str_set_len')
-  $defs << '-DHAVE_RB_STR_SET_LEN'
-end
-
-if have_header('sys/select.h')
-  $defs << '-DEV_USE_SELECT'
-end
-
-if have_header('poll.h')
-  $defs << '-DEV_USE_POLL'
-end
-
-if have_header('sys/epoll.h')
-  $defs << '-DEV_USE_EPOLL'
-end
-
-if have_header('sys/event.h') and have_header('sys/queue.h')
-  $defs << '-DEV_USE_KQUEUE'
-end
-
-if have_header('port.h')
-  $defs << '-DEV_USE_PORT'
-end
-
-if have_header('openssl/ssl.h')
-  $defs << '-DHAVE_OPENSSL_SSL_H'
-  libs << '-lssl -lcrypto'
-end
-
-# ncpu detection specifics
-case RUBY_PLATFORM
-when /linux/
-  $defs << '-DHAVE_LINUX_PROCFS'
-else
-  if have_func('sysctlbyname', ['sys/param.h', 'sys/sysctl.h'])
-    $defs << '-DHAVE_SYSCTLBYNAME'
-  end
-end
-
-$LIBS << ' ' << libs.join(' ')
-
-dir_config('em_buffer')
-create_makefile('em_buffer')
+require 'mkmf'
+
+libs = []
+
+$defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
+
+if have_func('rb_thread_blocking_region')
+  $defs << '-DHAVE_RB_THREAD_BLOCKING_REGION'
+end
+
+if have_func('rb_str_set_len')
+  $defs << '-DHAVE_RB_STR_SET_LEN'
+end
+
+if have_header('sys/select.h')
+  $defs << '-DEV_USE_SELECT'
+end
+
+if have_header('poll.h')
+  $defs << '-DEV_USE_POLL'
+end
+
+if have_header('sys/epoll.h')
+  $defs << '-DEV_USE_EPOLL'
+end
+
+if have_header('sys/event.h') and have_header('sys/queue.h')
+  $defs << '-DEV_USE_KQUEUE'
+end
+
+if have_header('port.h')
+  $defs << '-DEV_USE_PORT'
+end
+
+if have_header('openssl/ssl.h')
+  $defs << '-DHAVE_OPENSSL_SSL_H'
+  libs << '-lssl -lcrypto'
+end
+
+# ncpu detection specifics
+case RUBY_PLATFORM
+when /linux/
+  $defs << '-DHAVE_LINUX_PROCFS'
+else
+  if have_func('sysctlbyname', ['sys/param.h', 'sys/sysctl.h'])
+    $defs << '-DHAVE_SYSCTLBYNAME'
+  end
+end
+
+$LIBS << ' ' << libs.join(' ')
+
+dir_config('em_buffer')
+create_makefile('em_buffer')

data/ext/http11_client/ext_help.h

@@ -1,14 +1,14 @@
-#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
+#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 +1,6 @@
-require 'mkmf'
-
-dir_config("http11_client")
-have_library("c", "main")
-
-create_makefile("http11_client")
+require 'mkmf'
+
+dir_config("http11_client")
+have_library("c", "main")
+
+create_makefile("http11_client")

data/ext/http11_client/http11_client.c

@@ -1,328 +1,328 @@
-/**
- * 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 mEm;
-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")
-
-#ifndef RHASH_TBL
-/* rb_hash_lookup() is only in Ruby 1.8.7 */
-static VALUE rb_hash_lookup(VALUE hash, VALUE key)
-{
-  VALUE val;
-
-  if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
-    return Qnil; /* without Hash#default */
-  }
-
-  return val;
-}
-#endif
-
-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;
-  VALUE el = 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);
-    }
-  }
-
-  el = rb_hash_lookup(req, f);
-  switch(TYPE(el)) {
-    case T_ARRAY:
-      rb_ary_push(el, v);
-      break;
-    case T_STRING:
-      rb_hash_aset(req, f, rb_ary_new3(2, el, v));
-      break;
-    default:
-      rb_hash_aset(req, f, v);
-      break;
-  }
-}
-
-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()
-{
-
-  mEm = rb_define_module("EventMachine");
-
-  eHttpClientParserError = rb_define_class_under(mEm, "HttpClientParserError", rb_eIOError);
-
-  cHttpClientParser = rb_define_class_under(mEm, "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);
-}
-
-
+/**
+ * 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 mEm;
+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")
+
+#ifndef RHASH_TBL
+/* rb_hash_lookup() is only in Ruby 1.8.7 */
+static VALUE rb_hash_lookup(VALUE hash, VALUE key)
+{
+  VALUE val;
+
+  if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
+    return Qnil; /* without Hash#default */
+  }
+
+  return val;
+}
+#endif
+
+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;
+  VALUE el = 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);
+    }
+  }
+
+  el = rb_hash_lookup(req, f);
+  switch(TYPE(el)) {
+    case T_ARRAY:
+      rb_ary_push(el, v);
+      break;
+    case T_STRING:
+      rb_hash_aset(req, f, rb_ary_new3(2, el, v));
+      break;
+    default:
+      rb_hash_aset(req, f, v);
+      break;
+  }
+}
+
+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()
+{
+
+  mEm = rb_define_module("EventMachine");
+
+  eHttpClientParserError = rb_define_class_under(mEm, "HttpClientParserError", rb_eIOError);
+
+  cHttpClientParser = rb_define_class_under(mEm, "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);
+}
+
+