puma 2.15.1 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d4fcaf235b9f9fe96d11414de74d15922efab03
-  data.tar.gz: 0ccf633cd692e33c72e7dfe246454a015a616b6b
+  metadata.gz: 1173eb40e9b144235b309616535fe6bec2e2b782
+  data.tar.gz: d70686709d9be7b38eb308dd1ee423dfda95cdda
 SHA512:
-  metadata.gz: 4e14fd8cba285087bbedfe5c1a80394d7dc2e0a9c33e33d7f49d9ee07f220a86579bb6e8feee4f472ce13fcf24fe778fd2311cfbcfa733d35238292ba2d29963
-  data.tar.gz: ba7217636b273910aecabeb521209ebebff2024d132c54f40cbfc600fef143e6b0539e0ed98d49f2a062667c63e17c5f65bc2483cd62ab780557d767544f36a3
+  metadata.gz: 67548e119a3b36cb2bf6584019534d022c7b15078f937ee4e8c9fcaa550c2b7c3780b70c4d6d05f781321d174f39ced057dacf1d438452ccbcb531a52377146d
+  data.tar.gz: 7e444777b053f067ef7e1c44c1063aa18ffa753e21adad669851328eac037cebe6b4dc9b8bcf43e84cf3b7ec839cc6191cada672eafcf1ce212e709e0568540f

data/History.txt

@@ -1,3 +1,13 @@
+=== 2.15.2 / 2015-11-06
+
+* 2 bug fixes:
+  * ext/puma_http11: handle duplicate headers as per RFC
+  * Only set ctx.ca iff there is a params['ca'] to set with.
+
+* 2 PRs merged:
+  * Merge pull request #818 from unleashed/support-duplicate-headers
+  * Merge pull request #819 from VictorLowther/fix-ca-and-verify_null-exception
+
 === 2.15.1 / 2015-11-06
 
 * 1 bug fix:

data/ext/puma_http11/org/jruby/puma/Http11.java

@@ -82,11 +82,11 @@ public class Http11 extends RubyObject {
     private Http11Parser.FieldCB http_field = new Http11Parser.FieldCB() {
             public void call(Object data, int field, int flen, int value, int vlen) {
                 RubyHash req = (RubyHash)data;
-                RubyString v,f;
+                RubyString f;
+                IRubyObject v;
                 validateMaxLength(flen, MAX_FIELD_NAME_LENGTH, MAX_FIELD_NAME_LENGTH_ERR);
                 validateMaxLength(vlen, MAX_FIELD_VALUE_LENGTH, MAX_FIELD_VALUE_LENGTH_ERR);
 
-                v = RubyString.newString(runtime, new ByteList(Http11.this.hp.parser.buffer,value,vlen));
                 ByteList b = new ByteList(Http11.this.hp.parser.buffer,field,flen);
                 for(int i = 0,j = b.length();i<j;i++) {
                     if((b.get(i) & 0xFF) == '-') {
@@ -104,7 +104,16 @@ public class Http11 extends RubyObject {
                   f = RubyString.newString(runtime, "HTTP_");
                   f.cat(b);
                 }
-                req.op_aset(req.getRuntime().getCurrentContext(), f,v);
+
+                b = new ByteList(Http11.this.hp.parser.buffer, value, vlen);
+                v = req.op_aref(req.getRuntime().getCurrentContext(), f);
+                if (v.isNil()) {
+                    req.op_aset(req.getRuntime().getCurrentContext(), f, RubyString.newString(runtime, b));
+                } else {
+                    RubyString vs = v.convertToString();
+                    vs.cat(", ");
+                    vs.cat(b);
+                }
             }
         };
 

data/ext/puma_http11/puma_http11.c

@@ -176,14 +176,12 @@ static VALUE find_common_field_value(const char *field, size_t flen)
 void http_field(puma_parser* hp, const char *field, size_t flen,
                                  const char *value, size_t vlen)
 {
-  VALUE v = Qnil;
   VALUE f = Qnil;
+  VALUE v;
 
   VALIDATE_MAX_LENGTH(flen, FIELD_NAME);
   VALIDATE_MAX_LENGTH(vlen, FIELD_VALUE);
 
-  v = rb_str_new(value, vlen);
-
   f = find_common_field_value(field, flen);
 
   if (f == Qnil) {
@@ -201,7 +199,17 @@ void http_field(puma_parser* hp, const char *field, size_t flen,
     f = rb_str_new(hp->buf, new_size);
   }
 
-  rb_hash_aset(hp->request, f, v);
+  /* check for duplicate header */
+  v = rb_hash_aref(hp->request, f);
+
+  if (v == Qnil) {
+      v = rb_str_new(value, vlen);
+      rb_hash_aset(hp->request, f, v);
+  } else {
+      /* if duplicate header, normalize to comma-separated values */
+      rb_str_cat2(v, ", ");
+      rb_str_cat(v, value, vlen);
+  }
 }
 
 void request_method(puma_parser* hp, const char *at, size_t length)

data/lib/puma/binder.rb

@@ -166,7 +166,7 @@ module Puma
               end
             end
             
-            ctx.ca = params['ca']
+            ctx.ca = params['ca'] if params['ca']
 
             if  params['verify_mode']
               ctx.verify_mode = case params['verify_mode']

data/lib/puma/const.rb

@@ -99,7 +99,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.15.1".freeze
+    PUMA_VERSION = VERSION = "2.15.2".freeze
     CODE_NAME = "Autumn Arbor Airbrush".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.2
 platform: ruby
 authors:
 - Evan Phoenix