rhebok 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61548093f8e744650e5731c7ab82f72ffa9fcf1
-  data.tar.gz: 10f9816609bd7c2d2ea3d20c58c8d370322cd51d
+  metadata.gz: af0b8d340f3ed54ca6fe772d4898501e3a537065
+  data.tar.gz: e3ef8c73675ceee002c70b99f4cee0f8cda5f4d0
 SHA512:
-  metadata.gz: da3c44e43ded8df6eb0cd94bc1b63bb5fa98517ebd44dc02102414b396f697d5c669cb716a80a4fec8403d59fab04d63f2d20adac8cdfc643da2a77d691232fa
-  data.tar.gz: 1dd31b4b30c09ce383143a3c6a32c2d72f83b548f6b1120ee4994eb538ab3704f730754a559e43fc67dc308583fb8b599c5b919fb1a51e88dbc72adb3933d198
+  metadata.gz: 017f19ab1116a7066e0ce5d06ff4fea104e7fc6a040c2271caaf57a7a4560062347a46031c3614f0c0c3ca2dd3811b5a190789aeb4e4b662e1eece7c23114c92
+  data.tar.gz: 6d153fa1eea81ace6e63e2cc50e668d813c5a6ef3be20ca78ace54c5c4edf59784b437c8d78c2953c0614ff09a0ad46369b9a36df57ef696b470c7fc14739a9f

data/Changes

@@ -1,3 +1,7 @@
+0.8.2 2015-01-22T19:42:49Z
+
+    - tune around Expect
+
 0.8.1 2015-01-22T16:42:28Z
 
     - stringfy body and header values

data/ext/rhebok/rhebok.c

@@ -18,6 +18,8 @@
 #define MAX_HEADER_NAME_LEN 1024
 #define MAX_HEADERS         128
 #define BAD_REQUEST "HTTP/1.0 400 Bad Request\r\nConnection: close\r\n\r\n400 Bad Request\r\n"
+#define EXPECT_CONTINUE "HTTP/1.1 100 Continue\r\n\r\n"
+#define EXPECT_FAILED "HTTP/1.1 417 Expectation Failed\r\nContent-Type: text/plain\r\nConnection: close\r\n\r\nExpectation Failed\r\n"
 #define READ_BUF 16384
 #define TOU(ch) (('a' <= ch && ch <= 'z') ? ch - ('a' - 'A') : ch)
 
@@ -131,6 +133,8 @@ static VALUE zero_string_val;
 static VALUE http10_val;
 static VALUE http11_val;
 
+static VALUE expect_key;
+
 struct common_header {
   const char * name;
   size_t name_len;
@@ -583,6 +587,21 @@ VALUE rhe_accept(VALUE self, VALUE fileno, VALUE timeoutv, VALUE tcp, VALUE env)
     buf_len += rv;
   }
 
+  VALUE expect_val = rb_hash_aref(env, expect_key);
+  if ( expect_val != Qnil ) {
+      if ( strncmp(RSTRING_PTR(expect_val), "100-continue", RSTRING_LEN(expect_val)) == 0 ) {
+          rv = _write_timeout(fd, timeout, EXPECT_CONTINUE, sizeof(EXPECT_CONTINUE) - 1);
+          if ( rv <= 0 ) {
+              close(fd);
+              goto badexit;
+          }
+      } else {
+          rv = _write_timeout(fd, timeout, EXPECT_FAILED, sizeof(EXPECT_FAILED) - 1);
+          close(fd);
+          goto badexit;
+      }
+  }
+
   req = rb_ary_new2(2);
   rb_ary_push(req, rb_int_new(fd));
   rb_ary_push(req, rb_str_new(&read_buf[reqlen],buf_len - reqlen));
@@ -916,6 +935,9 @@ void Init_rhebok()
   http11_val = rb_obj_freeze(rb_str_new2("HTTP/1.1"));
   rb_gc_register_address(&http11_val);
 
+  expect_key = rb_obj_freeze(rb_str_new2("HTTP_EXPECT"));
+  rb_gc_register_address(&expect_key);
+  
   set_common_header("ACCEPT",sizeof("ACCEPT") - 1, 0);
   set_common_header("ACCEPT-ENCODING",sizeof("ACCEPT-ENCODING") - 1, 0);
   set_common_header("ACCEPT-LANGUAGE",sizeof("ACCEPT-LANGUAGE") - 1, 0);

data/lib/rack/handler/rhebok.rb

@@ -239,12 +239,7 @@ module Rack
             begin
               proc_req_count += 1
               @can_exit = false
-              # expect
-              if env.key?("HTTP_EXPECT") && env.delete("HTTP_EXPECT") == "100-continue"
-                ::Rhebok.write_all(connection, "HTTP/1.1 100 Continue\015\012\015\012", 0, @options[:Timeout])
-              end
               # handle request
-              is_chunked = env.key?("HTTP_TRANSFER_ENCODING") && env.delete("HTTP_TRANSFER_ENCODING") == 'chunked'
               if env.key?("CONTENT_LENGTH") && env["CONTENT_LENGTH"].to_i > 0
                 cl = env["CONTENT_LENGTH"].to_i
                 buffer = ::Rhebok::Buffered.new(cl,MAX_MEMORY_BUFFER_SIZE)
@@ -263,7 +258,7 @@ module Rack
                   cl -= chunk.bytesize
                 end
                 env["rack.input"] = buffer.rewind
-              elsif is_chunked
+              elsif env.key?("HTTP_TRANSFER_ENCODING") && env.delete("HTTP_TRANSFER_ENCODING") == 'chunked'
                 buffer = ::Rhebok::Buffered.new(0,MAX_MEMORY_BUFFER_SIZE)
                 chunked_buffer = '';
                 complete = false
@@ -303,15 +298,15 @@ module Rack
 
               use_chunked =  env["SERVER_PROTOCOL"] != "HTTP/1.1" ||
                              headers.key?("Transfer-Encoding") ||
-                             headers.key?("Content-Length") ? false : true
-              
+                             headers.key?("Content-Length") ? 0 : 1
+
               if body.instance_of?(Array)
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked ? 1 : 0)
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, body, use_chunked)
               else
-                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [], use_chunked ? 1 : 0)
+                ::Rhebok.write_response(connection, @options[:Timeout], status_code.to_i, headers, [], use_chunked)
                 body.each do |part|
                   ret = nil
-                  if use_chunked
+                  if use_chunked == 1
                     ret = ::Rhebok.write_all(connection, part.bytesize.to_s(16) + "\015\012" + part + "\015\012", 0, @options[:Timeout])
                   else
                     ret = ::Rhebok.write_all(connection, part, 0, @options[:Timeout])
@@ -320,7 +315,7 @@ module Rack
                     break
                   end
                 end #body.each
-                ::Rhebok.write_all(connection, "0\015\012\015\012", 0, @options[:Timeout]) if use_chunked
+                ::Rhebok.write_all(connection, "0\015\012\015\012", 0, @options[:Timeout]) if use_chunked == 1
                 body.respond_to?(:close) and body.close
               end
               #p [env,status_code,headers,body]

data/lib/rhebok/version.rb

@@ -1,3 +1,3 @@
 class Rhebok
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhebok
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Masahiro Nagano