Merge branch 'master' into v2.2.x

Changes

@@ -1,38 +1,36 @@
 Revision history for H2O.
 
-2.2.0-beta3 2017-03-21 13:45:00+0000
+2.2.0 TBD
+	- [core] add `crash-handler.wait-pipe-close` parameter #1092 (Frederik Deweerdt)
 	- [core] introduce an option to bypass the `server` header sent from upstream #1226 (Frederik Deweerdt)
 	- [core] apply global- and host-level configuration to requests not applicable to any of the path-level configurations #1231 (Kazuho Oku)
-	- [access-log] in JSON logging, remove surrounding quotes arround `null` #1229 (Kazuho Oku)
-	- [ssl] add doc for `handshake-timeout` #1233 (Kazuho Oku)
-
-2.2.0-beta2 2017-03-14 07:25:00+0000
+	- [access-log] add `%{remote}p` for logging the remote port #1166 (Kazuho Oku)
 	- [access-log] add support for JSON-style escapes and null #1208 (Kazuho Oku)
 	- [access-log] add specifier for logging per-request environment variables #1221 (Yannick Koechlin)
-	- [http1] stop reading from socket after sending 400 to avoid the risk of assertion failure #1223 (Frederik Deweerdt)
-	- [proxy] add directive for controlling the `via` request header #1225 (Frederik Deweerdt)
-	- [ssl] fix crash when a secp384r1, secp521r1 certificate is used with TLS 1.3 #1214 (Kazuho Oku)
-	- [ssl] fix build failure with OpenSSL 1.1.0 #1216 (Kazuho Oku)
-
-2.2.0-beta1 2017-02-28 02:20:00+0000
-	- [core] add `crash-handler.wait-pipe-close` parameter #1092 (Frederik Deweerdt)
-	- [access-log] add `%{remote}p` for logging the remote port #1166 (Kazuho Oku)
+	- [access-log] add support for `<`, `>` modifiers for logging either the original or the final response #1238 (Kazuho Oku)
 	- [access-log] do not emit request-total-time twice #1017 (Kazuho Oku)
 	- [fastcgi] fix a bug that closes the FastCGI listener socket during startup #1203 (Frederik Deweerdt)
 	- [file] add directive for serving gzipped files, decompressing them on-the-fly #1140 (Ichito Nagata)
 	- [headers] fix buffer overrun during startup #1180 (Frederik Deweerdt)
 	- [http1][proxy] preserve the cases of characters used in header names #1194 (Frederik Deweerdt)
 	- [http1][proxy] fix undefined behavior in HTTP/1 parser #1189 (Frederik Deweerdt)
+	- [http1] stop reading from socket after sending 400 to avoid the risk of assertion failure #1223 (Frederik Deweerdt)
 	- [http2] recognize `x-http2-push-only` attribute on `link` header #1169 (Frederik Deweerdt)
 	- [http2] add optional timeout for closing connections upon graceful shutdown #1108 (Frederik Deweerdt)
 	- [http2] do not ack an acked PING frame #1175 (Moto Ishisawa)
 	- [http2] reject requests exceeding the maximum allowed size more efficiently #1183 (Frederik Deweerdt)
 	- [mruby] remove dependenty to mkmf #1197 (Yuki Kurihara)
+	- [mruby] correct the line number reported on an exception #1239 (Ichito Nagata)
 	- [proxy] add directives for tweaking headers sent to upstream #1126 (Justin Zhu)
 	- [proxy] retain case-sensitivity of unix socket paths #1131 (Frederik Deweerdt)
+	- [proxy] add directive for controlling the `via` request header #1225 (Frederik Deweerdt)
 	- [ssl] add directive for logging session ID #1164 (Yannick Koechlin)
 	- [ssl] add support for TLS 1.3 draft-18 #1204 (Kazuho Oku)
 	- [ssl] stop evicting session entries in memcached when they are removed from internal cache #1185 (Ichito Nagata)
+	- [ssl] fix crash when a secp384r1, secp521r1 certificate is used with TLS 1.3 #1214 (Kazuho Oku)
+	- [ssl] fix build failure with OpenSSL 1.1.0 #1216 (Kazuho Oku)
+	- [ssl] add doc for `handshake-timeout` #1233 (Kazuho Oku)
+	- [status] fix race condition during start-up #1242 (Frederik Deweerdt)
 	- [libh2o] implement `h2o_evloop_destroy` #1200 (kazan417)
 	- [misc] add test code for fuzzing #1174 #1182 #1191 #1192 (Frederik Deweerdt, Jonathan Foote)
 	- [misc] fix issues reported by Coverity #1168 #1172 #1179 (Harrison Bowden, Frederik Deweerdt)

deps/mruby/.gitignore

@@ -17,6 +17,7 @@
 .svn
 /.git
 cscope.out
+tags
 /src/y.tab.c
 /bin
 /build