puma 2.16.0 → 3.11.4

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

@@ -15,7 +15,7 @@ public class Http11Parser {
 /** Data **/
 
 // line 18 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
-private static byte[] init__http_parser_actions_0()
+private static byte[] init__puma_parser_actions_0()
 {
 	return new byte [] {
 	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
@@ -25,24 +25,23 @@ private static byte[] init__http_parser_actions_0()
 	};
 }
 
-private static final byte _http_parser_actions[] = init__http_parser_actions_0();
+private static final byte _puma_parser_actions[] = init__puma_parser_actions_0();
 
 
-private static short[] init__http_parser_key_offsets_0()
+private static short[] init__puma_parser_key_offsets_0()
 {
 	return new short [] {
 	    0,    0,    8,   17,   27,   29,   30,   31,   32,   33,   34,   36,
-	   39,   41,   44,   45,   61,   62,   78,   80,   81,   90,   99,  105,
-	  111,  121,  130,  136,  142,  153,  159,  165,  175,  181,  187,  196,
-	  205,  211,  217,  226,  235,  244,  253,  262,  271,  280,  289,  298,
-	  307,  316,  325,  334,  343,  352,  361,  370,  379,  380
+	   39,   41,   44,   45,   61,   62,   78,   80,   81,   89,   97,  107,
+	  115,  125,  134,  142,  150,  159,  168,  177,  186,  195,  204,  213,
+	  222,  231,  240,  249,  258,  267,  276,  285,  294,  303,  312,  313
 	};
 }
 
-private static final short _http_parser_key_offsets[] = init__http_parser_key_offsets_0();
+private static final short _puma_parser_key_offsets[] = init__puma_parser_key_offsets_0();
 
 
-private static char[] init__http_parser_trans_keys_0()
+private static char[] init__puma_parser_trans_keys_0()
 {
 	return new char [] {
 	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
@@ -51,81 +50,73 @@ private static char[] init__http_parser_trans_keys_0()
 	   46,   48,   57,   48,   57,   13,   48,   57,   10,   13,   33,  124,
 	  126,   35,   39,   42,   43,   45,   46,   48,   57,   65,   90,   94,
 	  122,   10,   33,   58,  124,  126,   35,   39,   42,   43,   45,   46,
-	   48,   57,   65,   90,   94,  122,   13,   32,   13,   32,   37,   60,
-	   62,  127,    0,   31,   34,   35,   32,   37,   60,   62,  127,    0,
-	   31,   34,   35,   48,   57,   65,   70,   97,  102,   48,   57,   65,
-	   70,   97,  102,   43,   58,   45,   46,   48,   57,   65,   90,   97,
-	  122,   32,   34,   35,   37,   60,   62,  127,    0,   31,   48,   57,
-	   65,   70,   97,  102,   48,   57,   65,   70,   97,  102,   32,   34,
-	   35,   37,   59,   60,   62,   63,  127,    0,   31,   48,   57,   65,
-	   70,   97,  102,   48,   57,   65,   70,   97,  102,   32,   34,   35,
-	   37,   60,   62,   63,  127,    0,   31,   48,   57,   65,   70,   97,
-	  102,   48,   57,   65,   70,   97,  102,   32,   34,   35,   37,   60,
-	   62,  127,    0,   31,   32,   34,   35,   37,   60,   62,  127,    0,
-	   31,   48,   57,   65,   70,   97,  102,   48,   57,   65,   70,   97,
-	  102,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,
-	   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,
-	   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,
-	   95,   45,   46,   48,   57,   65,   90,   32,    0
+	   48,   57,   65,   90,   94,  122,   13,   32,   13,   32,   60,   62,
+	  127,    0,   31,   34,   35,   32,   60,   62,  127,    0,   31,   34,
+	   35,   43,   58,   45,   46,   48,   57,   65,   90,   97,  122,   32,
+	   34,   35,   60,   62,  127,    0,   31,   32,   34,   35,   59,   60,
+	   62,   63,  127,    0,   31,   32,   34,   35,   60,   62,   63,  127,
+	    0,   31,   32,   34,   35,   60,   62,  127,    0,   31,   32,   34,
+	   35,   60,   62,  127,    0,   31,   32,   36,   95,   45,   46,   48,
+	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
+	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
+	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
+	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
+	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
+	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
+	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
+	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
+	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
+	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
+	   32,   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,
+	   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,   46,   48,
+	   57,   65,   90,   32,   36,   95,   45,   46,   48,   57,   65,   90,
+	   32,    0
 	};
 }
 
-private static final char _http_parser_trans_keys[] = init__http_parser_trans_keys_0();
+private static final char _puma_parser_trans_keys[] = init__puma_parser_trans_keys_0();
 
 
-private static byte[] init__http_parser_single_lengths_0()
+private static byte[] init__puma_parser_single_lengths_0()
 {
 	return new byte [] {
 	    0,    2,    3,    4,    2,    1,    1,    1,    1,    1,    0,    1,
-	    0,    1,    1,    4,    1,    4,    2,    1,    5,    5,    0,    0,
-	    2,    7,    0,    0,    9,    0,    0,    8,    0,    0,    7,    7,
-	    0,    0,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    3,    1,    0
+	    0,    1,    1,    4,    1,    4,    2,    1,    4,    4,    2,    6,
+	    8,    7,    6,    6,    3,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    1,    0
 	};
 }
 
-private static final byte _http_parser_single_lengths[] = init__http_parser_single_lengths_0();
+private static final byte _puma_parser_single_lengths[] = init__puma_parser_single_lengths_0();
 
 
-private static byte[] init__http_parser_range_lengths_0()
+private static byte[] init__puma_parser_range_lengths_0()
 {
 	return new byte [] {
 	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    1,    1,
-	    1,    1,    0,    6,    0,    6,    0,    0,    2,    2,    3,    3,
-	    4,    1,    3,    3,    1,    3,    3,    1,    3,    3,    1,    1,
-	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-	    3,    3,    3,    3,    3,    3,    3,    3,    0,    0
+	    1,    1,    0,    6,    0,    6,    0,    0,    2,    2,    4,    1,
+	    1,    1,    1,    1,    3,    3,    3,    3,    3,    3,    3,    3,
+	    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,    0,    0
 	};
 }
 
-private static final byte _http_parser_range_lengths[] = init__http_parser_range_lengths_0();
+private static final byte _puma_parser_range_lengths[] = init__puma_parser_range_lengths_0();
 
 
-private static short[] init__http_parser_index_offsets_0()
+private static short[] init__puma_parser_index_offsets_0()
 {
 	return new short [] {
 	    0,    0,    6,   13,   21,   24,   26,   28,   30,   32,   34,   36,
-	   39,   41,   44,   46,   57,   59,   70,   73,   75,   83,   91,   95,
-	   99,  106,  115,  119,  123,  134,  138,  142,  152,  156,  160,  169,
-	  178,  182,  186,  193,  200,  207,  214,  221,  228,  235,  242,  249,
-	  256,  263,  270,  277,  284,  291,  298,  305,  312,  314
+	   39,   41,   44,   46,   57,   59,   70,   73,   75,   82,   89,   96,
+	  104,  114,  123,  131,  139,  146,  153,  160,  167,  174,  181,  188,
+	  195,  202,  209,  216,  223,  230,  237,  244,  251,  258,  265,  267
 	};
 }
 
-private static final short _http_parser_index_offsets[] = init__http_parser_index_offsets_0();
+private static final short _puma_parser_index_offsets[] = init__puma_parser_index_offsets_0();
 
 
-private static byte[] init__http_parser_indicies_0()
+private static byte[] init__puma_parser_indicies_0()
 {
 	return new byte [] {
 	    0,    0,    0,    0,    0,    1,    2,    3,    3,    3,    3,    3,
@@ -134,71 +125,62 @@ private static byte[] init__http_parser_indicies_0()
 	   16,   15,    1,   17,    1,   18,   17,    1,   19,    1,   20,   21,
 	   21,   21,   21,   21,   21,   21,   21,   21,    1,   22,    1,   23,
 	   24,   23,   23,   23,   23,   23,   23,   23,   23,    1,   26,   27,
-	   25,   29,   28,   30,   32,    1,    1,    1,    1,    1,   31,   33,
-	   35,    1,    1,    1,    1,    1,   34,   36,   36,   36,    1,   34,
-	   34,   34,    1,   37,   38,   37,   37,   37,   37,    1,    8,    1,
-	    9,   39,    1,    1,    1,    1,   38,   40,   40,   40,    1,   38,
-	   38,   38,    1,   41,    1,   43,   44,   45,    1,    1,   46,    1,
-	    1,   42,   47,   47,   47,    1,   42,   42,   42,    1,    8,    1,
-	    9,   49,    1,    1,   50,    1,    1,   48,   51,   51,   51,    1,
-	   48,   48,   48,    1,   52,    1,   54,   55,    1,    1,    1,    1,
-	   53,   56,    1,   58,   59,    1,    1,    1,    1,   57,   60,   60,
-	   60,    1,   57,   57,   57,    1,    2,   61,   61,   61,   61,   61,
-	    1,    2,   62,   62,   62,   62,   62,    1,    2,   63,   63,   63,
-	   63,   63,    1,    2,   64,   64,   64,   64,   64,    1,    2,   65,
-	   65,   65,   65,   65,    1,    2,   66,   66,   66,   66,   66,    1,
-	    2,   67,   67,   67,   67,   67,    1,    2,   68,   68,   68,   68,
-	   68,    1,    2,   69,   69,   69,   69,   69,    1,    2,   70,   70,
-	   70,   70,   70,    1,    2,   71,   71,   71,   71,   71,    1,    2,
-	   72,   72,   72,   72,   72,    1,    2,   73,   73,   73,   73,   73,
-	    1,    2,   74,   74,   74,   74,   74,    1,    2,   75,   75,   75,
-	   75,   75,    1,    2,   76,   76,   76,   76,   76,    1,    2,   77,
-	   77,   77,   77,   77,    1,    2,   78,   78,   78,   78,   78,    1,
-	    2,    1,    1,    0
+	   25,   29,   28,   30,    1,    1,    1,    1,    1,   31,   32,    1,
+	    1,    1,    1,    1,   33,   34,   35,   34,   34,   34,   34,    1,
+	    8,    1,    9,    1,    1,    1,    1,   35,   36,    1,   38,   39,
+	    1,    1,   40,    1,    1,   37,    8,    1,    9,    1,    1,   42,
+	    1,    1,   41,   43,    1,   45,    1,    1,    1,    1,   44,   46,
+	    1,   48,    1,    1,    1,    1,   47,    2,   49,   49,   49,   49,
+	   49,    1,    2,   50,   50,   50,   50,   50,    1,    2,   51,   51,
+	   51,   51,   51,    1,    2,   52,   52,   52,   52,   52,    1,    2,
+	   53,   53,   53,   53,   53,    1,    2,   54,   54,   54,   54,   54,
+	    1,    2,   55,   55,   55,   55,   55,    1,    2,   56,   56,   56,
+	   56,   56,    1,    2,   57,   57,   57,   57,   57,    1,    2,   58,
+	   58,   58,   58,   58,    1,    2,   59,   59,   59,   59,   59,    1,
+	    2,   60,   60,   60,   60,   60,    1,    2,   61,   61,   61,   61,
+	   61,    1,    2,   62,   62,   62,   62,   62,    1,    2,   63,   63,
+	   63,   63,   63,    1,    2,   64,   64,   64,   64,   64,    1,    2,
+	   65,   65,   65,   65,   65,    1,    2,   66,   66,   66,   66,   66,
+	    1,    2,    1,    1,    0
 	};
 }
 
-private static final byte _http_parser_indicies[] = init__http_parser_indicies_0();
+private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0();
 
 
-private static byte[] init__http_parser_trans_targs_0()
+private static byte[] init__puma_parser_trans_targs_0()
 {
 	return new byte [] {
-	    2,    0,    3,   38,    4,   24,   28,   25,    5,   20,    6,    7,
-	    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   57,   17,
-	   18,   19,   14,   18,   19,   14,    5,   21,   22,    5,   21,   22,
-	   23,   24,   25,   26,   27,    5,   28,   20,   29,   31,   34,   30,
-	   31,   32,   34,   33,    5,   35,   20,   36,    5,   35,   20,   36,
-	   37,   39,   40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-	   50,   51,   52,   53,   54,   55,   56
+	    2,    0,    3,   28,    4,   22,   24,   23,    5,   20,    6,    7,
+	    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   47,   17,
+	   18,   19,   14,   18,   19,   14,    5,   21,    5,   21,   22,   23,
+	    5,   24,   20,   25,   26,   25,   26,    5,   27,   20,    5,   27,
+	   20,   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
+	   40,   41,   42,   43,   44,   45,   46
 	};
 }
 
-private static final byte _http_parser_trans_targs[] = init__http_parser_trans_targs_0();
+private static final byte _puma_parser_trans_targs[] = init__puma_parser_trans_targs_0();
 
 
-private static byte[] init__http_parser_trans_actions_0()
+private static byte[] init__puma_parser_trans_actions_0()
 {
 	return new byte [] {
 	    1,    0,   11,    0,    1,    1,    1,    1,   13,   13,    1,    0,
 	    0,    0,    0,    0,    0,    0,   19,    0,    0,   28,   23,    3,
-	    5,    7,   31,    7,    0,    9,   25,    1,    1,   15,    0,    0,
-	    0,    0,    0,    0,    0,   37,    0,   37,    0,   21,   21,    0,
-	    0,    0,    0,    0,   40,   17,   40,   17,   34,    0,   34,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    5,    7,   31,    7,    0,    9,   25,    1,   15,    0,    0,    0,
+	   37,    0,   37,   21,   21,    0,    0,   40,   17,   40,   34,    0,
+	   34,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
-private static final byte _http_parser_trans_actions[] = init__http_parser_trans_actions_0();
+private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans_actions_0();
 
 
-static final int http_parser_start = 1;
-static final int http_parser_first_final = 57;
-static final int http_parser_error = 0;
-
-static final int http_parser_en_main = 1;
-
+static final int puma_parser_start = 1;
+static final int puma_parser_first_final = 47;
+static final int puma_parser_error = 0;
 
 // line 69 "ext/puma_http11/http11_parser.java.rl"
 
@@ -235,10 +217,10 @@ static final int http_parser_en_main = 1;
       public void init() {
           cs = 0;
 
-          
-// line 240 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+
+// line 225 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
-	cs = http_parser_start;
+	cs = puma_parser_start;
 	}
 
 // line 104 "ext/puma_http11/http11_parser.java.rl"
@@ -267,8 +249,8 @@ static final int http_parser_en_main = 1;
      byte[] data = buffer.bytes();
      parser.buffer = buffer;
 
-     
-// line 272 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+
+// line 257 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -290,9 +272,9 @@ static final int http_parser_en_main = 1;
 	}
 case 1:
 	_match: do {
-	_keys = _http_parser_key_offsets[cs];
-	_trans = _http_parser_index_offsets[cs];
-	_klen = _http_parser_single_lengths[cs];
+	_keys = _puma_parser_key_offsets[cs];
+	_trans = _puma_parser_index_offsets[cs];
+	_klen = _puma_parser_single_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -302,9 +284,9 @@ case 1:
 				break;
 
 			_mid = _lower + ((_upper-_lower) >> 1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 1;
-			else if ( data[p] > _http_parser_trans_keys[_mid] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid] )
 				_lower = _mid + 1;
 			else {
 				_trans += (_mid - _keys);
@@ -315,7 +297,7 @@ case 1:
 		_trans += _klen;
 	}
 
-	_klen = _http_parser_range_lengths[cs];
+	_klen = _puma_parser_range_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -325,9 +307,9 @@ case 1:
 				break;
 
 			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 2;
-			else if ( data[p] > _http_parser_trans_keys[_mid+1] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid+1] )
 				_lower = _mid + 2;
 			else {
 				_trans += ((_mid - _keys)>>1);
@@ -338,15 +320,15 @@ case 1:
 	}
 	} while (false);
 
-	_trans = _http_parser_indicies[_trans];
-	cs = _http_parser_trans_targs[_trans];
+	_trans = _puma_parser_indicies[_trans];
+	cs = _puma_parser_trans_targs[_trans];
 
-	if ( _http_parser_trans_actions[_trans] != 0 ) {
-		_acts = _http_parser_trans_actions[_trans];
-		_nacts = (int) _http_parser_actions[_acts++];
+	if ( _puma_parser_trans_actions[_trans] != 0 ) {
+		_acts = _puma_parser_trans_actions[_trans];
+		_nacts = (int) _puma_parser_actions[_acts++];
 		while ( _nacts-- > 0 )
 	{
-			switch ( _http_parser_actions[_acts++] )
+			switch ( _puma_parser_actions[_acts++] )
 			{
 	case 0:
 // line 13 "ext/puma_http11/http11_parser.java.rl"
@@ -362,7 +344,7 @@ case 1:
 	break;
 	case 3:
 // line 17 "ext/puma_http11/http11_parser.java.rl"
-	{ 
+	{
     parser.field_len = p-parser.field_start;
   }
 	break;
@@ -372,7 +354,7 @@ case 1:
 	break;
 	case 5:
 // line 22 "ext/puma_http11/http11_parser.java.rl"
-	{ 
+	{
     if(parser.http_field != null) {
       parser.http_field.call(parser.data, parser.field_start, parser.field_len, parser.mark, p-parser.mark);
     }
@@ -380,21 +362,21 @@ case 1:
 	break;
 	case 6:
 // line 27 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    if(parser.request_method != null) 
+	{
+    if(parser.request_method != null)
       parser.request_method.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 7:
 // line 31 "ext/puma_http11/http11_parser.java.rl"
-	{ 
+	{
     if(parser.request_uri != null)
       parser.request_uri.call(parser.data, parser.mark, p-parser.mark);
   }
 	break;
 	case 8:
 // line 35 "ext/puma_http11/http11_parser.java.rl"
-	{ 
+	{
     if(parser.fragment != null)
       parser.fragment.call(parser.data, parser.mark, p-parser.mark);
   }
@@ -405,14 +387,14 @@ case 1:
 	break;
 	case 10:
 // line 41 "ext/puma_http11/http11_parser.java.rl"
-	{ 
+	{
     if(parser.query_string != null)
       parser.query_string.call(parser.data, parser.query_start, p-parser.query_start);
   }
 	break;
 	case 11:
 // line 46 "ext/puma_http11/http11_parser.java.rl"
-	{	
+	{
     if(parser.http_version != null)
       parser.http_version.call(parser.data, parser.mark, p-parser.mark);
   }
@@ -426,14 +408,14 @@ case 1:
 	break;
 	case 13:
 // line 56 "ext/puma_http11/http11_parser.java.rl"
-	{ 
-    parser.body_start = p + 1; 
+	{
+    parser.body_start = p + 1;
     if(parser.header_done != null)
       parser.header_done.call(parser.data, p + 1, pe - p - 1);
     { p += 1; _goto_targ = 5; if (true)  continue _goto;}
   }
 	break;
-// line 437 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
+// line 422 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 			}
 		}
 	}
@@ -457,7 +439,7 @@ case 5:
 
      parser.cs = cs;
      parser.nread += (p - off);
-     
+
      assert p <= pe                  : "buffer overflow after parsing execute";
      assert parser.nread <= len      : "nread longer than length";
      assert parser.body_start <= len : "body starts after buffer end";
@@ -479,10 +461,10 @@ case 5:
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }

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

@@ -6,6 +6,7 @@ import org.jruby.RubyModule;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -18,6 +19,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -27,6 +29,7 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 
 import static javax.net.ssl.SSLEngineResult.Status;
@@ -333,7 +336,11 @@ public class MiniSSL extends RubyObject {
   }
 
   @JRubyMethod
-  public IRubyObject peercert() {
-    return getRuntime().getNil();
+  public IRubyObject peercert() throws CertificateEncodingException {
+    try {
+      return JavaEmbedUtils.javaToRuby(getRuntime(), engine.getSession().getPeerCertificates()[0].getEncoded());
+    } catch (SSLPeerUnverifiedException ex) {
+      return getRuntime().getNil();
+    }
   }
 }

data/ext/puma_http11/puma_http11.c

@@ -1,6 +1,7 @@
 /**
  * Copyright (c) 2005 Zed A. Shaw
  * You can redistribute it and/or modify it under the same terms as Ruby.
+ * License 3-clause BSD
  */
 
 #define RSTRING_NOT_MODIFIED 1

data/lib/puma/app/status.rb

@@ -49,12 +49,20 @@ module Puma
           end
 
         when /\/reload-worker-directory$/
-          if !@cli.reload_worker_directory
+          if !@cli.send(:reload_worker_directory)
             return rack_response(404, '{ "error": "reload_worker_directory not available" }')
           else
             return rack_response(200, OK_STATUS)
           end
 
+        when /\/gc$/
+          GC.start
+          return rack_response(200, OK_STATUS)
+
+        when /\/gc-stats$/
+          json = "{" + GC.stat.map { |k, v| "\"#{k}\": #{v}" }.join(",") + "}"
+          return rack_response(200, json)
+
         when /\/stats$/
           return rack_response(200, @cli.stats)
         else