kcar 0.2.0 → 0.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.2.0.GIT
+DEF_VER=v0.3.0.GIT
 
 LF='
 '

data/README

@@ -83,7 +83,7 @@ don't email the git mailing list or maintainer with kcar patches.
 == Contact
 
 All feedback (bug reports, user/development discussion, patches, pull
-requests) go to the mailing list: mailto:kcar@librelist.com
+requests) go to the mailing list: mailto:kcar@librelist.org
 
 The mailing list is mirrored to Gmane, all information about the
 group is here:

data/TODO

@@ -1,2 +1,2 @@
-Patches to kcar@librelist.com (via git format-patch + git send-email) for
+Patches to kcar@librelist.org (via git format-patch + git send-email) for
 these would be greatly appreciated

data/ext/kcar/kcar.rl

@@ -70,12 +70,27 @@ struct http_parser {
 #define MARK(M,FPC) (hp->M = (FPC) - buffer)
 #define PTR_TO(F) (buffer + hp->F)
 #define STR_NEW(M,FPC) rb_str_new(PTR_TO(M), LEN(M, FPC))
+#define STRIPPED_STR_NEW(M,FPC) stripped_str_new(PTR_TO(M), LEN(M, FPC))
 
 #define HP_FL_TEST(hp,fl) ((hp)->flags & (UH_FL_##fl))
 #define HP_FL_SET(hp,fl) ((hp)->flags |= (UH_FL_##fl))
 #define HP_FL_UNSET(hp,fl) ((hp)->flags &= ~(UH_FL_##fl))
 #define HP_FL_ALL(hp,fl) (HP_FL_TEST(hp, fl) == (UH_FL_##fl))
 
+static int is_lws(char c)
+{
+  return (c == ' ' || c == '\t');
+}
+
+static VALUE stripped_str_new(const char *str, long len)
+{
+  long end;
+
+  for (end = len - 1; end >= 0 && is_lws(str[end]); end--);
+
+  return rb_str_new(str, end + 1);
+}
+
 static void finalize_header(struct http_parser *hp)
 {
   if ((HP_FL_TEST(hp, HASTRAILER) && ! HP_FL_TEST(hp, CHUNKED)))
@@ -144,6 +159,9 @@ static void write_cont_value(struct http_parser *hp,
                              char *buffer, const char *p)
 {
   char *vptr;
+  long end;
+  long len = LEN(mark, p);
+  long cont_len;
 
   if (hp->cont == Qfalse)
     rb_raise(eParserError, "invalid continuation line");
@@ -154,19 +172,24 @@ static void write_cont_value(struct http_parser *hp,
   assert(TYPE(hp->cont) == T_STRING && "continuation line is not a string");
   assert(hp->mark > 0 && "impossible continuation line offset");
 
-  if (LEN(mark, p) == 0)
+  if (len == 0)
     return;
 
-  if (RSTRING_LEN(hp->cont) > 0)
+  cont_len = RSTRING_LEN(hp->cont);
+  if (cont_len > 0) {
     --hp->mark;
+    len = LEN(mark, p);
+  }
 
   vptr = PTR_TO(mark);
 
-  if (RSTRING_LEN(hp->cont) > 0) {
+  /* normalize tab to space */
+  if (cont_len > 0) {
     assert((' ' == *vptr || '\t' == *vptr) && "invalid leading white space");
     *vptr = ' ';
   }
-  rb_str_buf_cat(hp->cont, vptr, LEN(mark, p));
+  for (end = len - 1; end >= 0 && is_lws(vptr[end]); end--);
+  rb_str_buf_cat(hp->cont, vptr, end + 1);
 }
 
 static void write_value(VALUE hdr, struct http_parser *hp,
@@ -192,7 +215,7 @@ static void write_value(VALUE hdr, struct http_parser *hp,
   VALIDATE_MAX_LENGTH(vlen, FIELD_VALUE);
   VALIDATE_MAX_LENGTH(flen, FIELD_NAME);
   f = rb_str_new(fptr, (long)flen);
-  v = rb_str_new(vptr, (long)vlen);
+  v = stripped_str_new(vptr, (long)vlen);
 
   /* needs more tests for error-checking here */
   /*
@@ -602,6 +625,7 @@ static VALUE filter_body(VALUE self, VALUE buf, VALUE data)
   dlen = RSTRING_LEN(data);
 
   StringValue(buf);
+  rb_str_modify(buf);
   rb_str_resize(buf, dlen); /* we can never copy more than dlen bytes */
   OBJ_TAINT(buf); /* keep weirdo $SAFE users happy */
 

data/ext/kcar/kcar_http_common.rl

@@ -36,7 +36,7 @@
 
   value_cont = lws+ any* >start_value %write_cont_value;
 
-  message_header = ((field_name ":" " "* field_value)|value_cont) :> CRLF;
+  message_header = ((field_name ":" lws* field_value)|value_cont) :> CRLF;
   chunk_ext_val = token*;
   chunk_ext_name = token*;
   chunk_extension = ( ";" " "* chunk_ext_name ("=" chunk_ext_val)? )*;

data/lib/kcar/response.rb

@@ -113,7 +113,7 @@ class Kcar::Response
     # in the response, we'll just yield a stringified version to our
     # server and pretend it's part of the body.
     trailers = @parser.extract_trailers(@hdr)
-    yield(trailers.map! { |k,v| "#{k}: #{v}\r\n" }.join("") << CRLF)
+    yield(trailers.map! { |k,v| "#{k}: #{v}\r\n" }.join << CRLF)
   end
 
   def each_until_eof

data/pkg.mk

@@ -69,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
 	$(RM) -r doc
 	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/test/test_parser.rb

@@ -254,4 +254,39 @@ class TestParser < Test::Unit::TestCase
     end
   end
 
+  def test_leading_tab
+    resp = "HTTP/1.1 200 OK\r\nHost:\texample.com\r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal 'example.com', env['Host']
+  end
+
+  def test_trailing_whitespace
+    resp = "HTTP/1.1 200 OK\r\nHost: example.com \r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal 'example.com', env['Host']
+  end
+
+  def test_trailing_tab
+    resp = "HTTP/1.1 200 OK\r\nHost: example.com\t\r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal 'example.com', env['Host']
+  end
+
+  def test_trailing_multiple_linear_whitespace
+    resp = "HTTP/1.1 200 OK\r\nHost: example.com\t \t \t\r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal 'example.com', env['Host']
+  end
+
+  def test_embedded_linear_whitespace_ok
+    resp = "HTTP/1.1 200 OK\r\nX-Space: hello\t world\t \r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal "hello\t world", env["X-Space"]
+  end
+
+  def test_empty_header
+    resp = "HTTP/1.1 200 OK\r\nHost:  \r\n\r\n"
+    assert @hp.headers(env = {}, resp)
+    assert_equal '', env['Host']
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kcar
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - kcar hackers
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +00:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wrongdoc
@@ -83,7 +82,6 @@ files:
 - setup.rb
 - test/test_parser.rb
 - test/test_response.rb
-has_rdoc: true
 homepage: http://bogomips.org/kcar/
 licenses: []
 
@@ -116,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.5.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: bytestream to Rack response converter