set version to 2.2.0-beta3 and release date

CMakeLists.txt

@@ -27,7 +27,7 @@ PROJECT(h2o)
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "2")
 SET(VERSION_PATCH "0")
-SET(VERSION_PRERELEASE "-beta2")
+SET(VERSION_PRERELEASE "-beta3")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_PRERELEASE}")
 SET(LIBRARY_VERSION_MAJOR "0")
 SET(LIBRARY_VERSION_MINOR "13")
@@ -542,8 +542,11 @@ ADD_CUSTOM_TARGET(check env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} pr
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS h2o t-00unit-evloop.t)
 IF (LIBUV_FOUND)
-    ADD_DEPENDENCIES(check t-00unit-libuv.t lib-examples)
-ENDIF (LIBUV_FOUND)
+    ADD_DEPENDENCIES(check t-00unit-libuv.t)
+    IF (OPENSSL_FOUND)
+        ADD_DEPENDENCIES(check lib-examples)
+    ENDIF ()
+ENDIF ()
 
 ADD_CUSTOM_TARGET(check-as-root env H2O_ROOT=. BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove -v t/90root-*.t
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

Changes

@@ -1,5 +1,11 @@
 Revision history for H2O.
 
+2.2.0-beta3 2017-03-21 13:45:00+0000
+	- [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 support for JSON-style escapes and null #1208 (Kazuho Oku)
 	- [access-log] add specifier for logging per-request environment variables #1221 (Yannick Koechlin)

deps/picotls/CMakeLists.txt

@@ -34,6 +34,7 @@ IF (OPENSSL_FOUND AND NOT (OPENSSL_VERSION VERSION_LESS "1.0.1"))
     ADD_EXECUTABLE(cli t/cli.c)
     TARGET_LINK_LIBRARIES(cli picotls-openssl picotls-core ${OPENSSL_LIBRARIES})
     ADD_EXECUTABLE(test-openssl.t ${MINICRYPTO_LIBRARY_FILES} lib/cifra.c lib/uecc.c deps/picotest/picotest.c t/picotls.c t/openssl.c)
+    SET_TARGET_PROPERTIES(test-openssl.t PROPERTIES COMPILE_FLAGS "-DPTLS_MEMORY_DEBUG=1")
     TARGET_LINK_LIBRARIES(test-openssl.t ${OPENSSL_LIBRARIES})
     SET(TEST_EXES ${TEST_EXES} test-openssl.t)
 ELSE ()

deps/picotls/lib/picotls.c

@@ -83,6 +83,10 @@
 #define PTLS_DEBUGF(...)
 #endif
 
+#ifndef PTLS_MEMORY_DEBUG
+#define PTLS_MEMORY_DEBUG 0
+#endif
+
 struct st_ptls_traffic_protection_t {
     uint8_t secret[PTLS_MAX_DIGEST_SIZE];
     ptls_aead_context_t *aead;
@@ -362,14 +366,14 @@ int ptls_buffer_reserve(ptls_buffer_t *buf, size_t delta)
     if (buf->base == NULL)
         return PTLS_ERROR_NO_MEMORY;
 
-    if (buf->capacity < buf->off + delta) {
+    if (PTLS_MEMORY_DEBUG || buf->capacity < buf->off + delta) {
         uint8_t *newp;
         size_t new_capacity = buf->capacity;
         if (new_capacity < 1024)
             new_capacity = 1024;
-        do {
+        while (new_capacity < buf->off + delta) {
             new_capacity *= 2;
-        } while (new_capacity < buf->off + delta);
+        }
         if ((newp = malloc(new_capacity)) == NULL)
             return PTLS_ERROR_NO_MEMORY;
         memcpy(newp, buf->base, buf->off);
@@ -2576,12 +2580,14 @@ static int handle_handshake_record(ptls_t *tls, int (*cb)(ptls_t *tls, ptls_buff
 
     /* keep last partial message in buffer */
     if (src != src_end) {
-        if (tls->recvbuf.mess.base == NULL)
+        if (tls->recvbuf.mess.base == NULL) {
             ptls_buffer_init(&tls->recvbuf.mess, "", 0);
-        tls->recvbuf.mess.off = 0;
-        if ((ret = ptls_buffer_reserve(&tls->recvbuf.mess, src_end - src)) != 0)
-            return ret;
-        memcpy(tls->recvbuf.mess.base, src, src_end - src);
+            if ((ret = ptls_buffer_reserve(&tls->recvbuf.mess, src_end - src)) != 0)
+                return ret;
+            memcpy(tls->recvbuf.mess.base, src, src_end - src);
+        } else {
+            memmove(tls->recvbuf.mess.base, src, src_end - src);
+        }
         tls->recvbuf.mess.off = src_end - src;
     } else {
         ptls_buffer_dispose(&tls->recvbuf.mess);

doc/configure/base_directives.html

@@ -410,6 +410,26 @@ <h3><a href="configure/base_directives.html#error-log.emit-request-errors"><code
 </dd>
 </dl>
 
+<div id="handshake-timeout" class="directive-head">
+<h3><a href="configure/base_directives.html#handshake-timeout"><code>"handshake-timeout"</code></a></h3>
+</div>
+
+<dl class="directive-desc">
+<dt>Description:</dt>
+<dd>
+<p>
+Maximum time (in seconds) that can be spent by a connection before it becomes ready to accept an HTTP request.
+</p>
+
+Times spent for receiving <a href="configure/base_directives.html#listen-proxy-protocol">the PROXY protocol</a> and TLS handshake are counted.
+
+</dd>
+<dt><a href="configure/syntax_and_structure.html#config_levels">Level</a>:</dt>
+<dd>global</dd>
+<dt>Default:</dt>
+<dd><code><pre>handshake-timeout: 10</pre></code>
+</dl>
+
 <div id="limit-request-body" class="directive-head">
 <h3><a href="configure/base_directives.html#limit-request-body"><code>"limit-request-body"</code></a></h3>
 </div>

h2o.xcodeproj/project.pbxproj

@@ -3256,7 +3256,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"/usr/local/openssl-1.0.2/lib",
-					build/osx/mruby/host/lib,
+					build/default/mruby/host/lib,
 					/usr/local/lib,
 				);
 				OTHER_CFLAGS = "";
@@ -3290,7 +3290,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"/usr/local/openssl-1.0.2/lib",
-					build/osx/mruby/host/lib,
+					build/default/mruby/host/lib,
 					/usr/local/lib,
 				);
 				OTHER_CFLAGS = "";
@@ -3320,7 +3320,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"/usr/local/openssl-1.0.2/lib",
-					build/osx/mruby/host/lib,
+					build/default/mruby/host/lib,
 					/usr/local/lib,
 				);
 				OTHER_CFLAGS = "";
@@ -3350,7 +3350,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"/usr/local/openssl-1.0.2/lib",
-					build/osx/mruby/host/lib,
+					build/default/mruby/host/lib,
 					/usr/local/lib,
 				);
 				OTHER_CFLAGS = "";

include/h2o.h

@@ -390,15 +390,19 @@ struct st_h2o_globalconf_t {
         /**
          * a boolean flag if set to true, instructs the proxy to preserve the x-forwarded-proto header passed by the client
          */
-        int preserve_x_forwarded_proto;
+        unsigned preserve_x_forwarded_proto : 1;
+        /**
+         * a boolean flag if set to true, instructs the proxy to preserve the server header passed by the origin
+         */
+        unsigned preserve_server_header : 1;
         /**
          * a boolean flag if set to true, instructs the proxy to emit x-forwarded-proto and x-forwarded-for headers
          */
-        int emit_x_forwarded_headers;
+        unsigned emit_x_forwarded_headers : 1;
         /**
          * a boolean flag if set to true, instructs the proxy to emit a via header
          */
-        int emit_via_header;
+        unsigned emit_via_header : 1;
     } proxy;
 
     /**

include/h2o/http2_internal.h

@@ -179,7 +179,7 @@ struct st_h2o_http2_stream_t {
         h2o_linklist_t link;
         h2o_http2_scheduler_openref_t scheduler;
     } _refs;
-    h2o_send_state_t send_state; /* steate of the ostream, only used in push mode */
+    h2o_send_state_t send_state; /* state of the ostream, only used in push mode */
     /* placed at last since it is large and has it's own ctor */
     h2o_req_t req;
 };

include/h2o/version.h

@@ -22,7 +22,7 @@
 #ifndef h2o__version_h
 #define h2o__version_h
 
-#define H2O_VERSION "2.2.0-beta2"
+#define H2O_VERSION "2.2.0-beta3"
 
 #define H2O_VERSION_MAJOR 2
 #define H2O_VERSION_MINOR 2