Merging upstream version 1.40.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 91 insertions, 93 deletions

diff --git a/Makefile.am b/Makefile.am
index 666847dc..3fc97825 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -947,103 +947,101 @@ HTTPD_FILES = \
     httpd/h2o_utils.h \
     $(NULL)
 
-libh2o_dir = httpd/h2o
-
 libh2o_a_SOURCES = \
-    $(libh2o_dir)/deps/cloexec/cloexec.c \
-    $(libh2o_dir)/deps/libgkc/gkc.c \
-    $(libh2o_dir)/deps/libyrmcds/close.c \
-    $(libh2o_dir)/deps/libyrmcds/connect.c \
-    $(libh2o_dir)/deps/libyrmcds/recv.c \
-    $(libh2o_dir)/deps/libyrmcds/send.c \
-    $(libh2o_dir)/deps/libyrmcds/send_text.c \
-    $(libh2o_dir)/deps/libyrmcds/socket.c \
-    $(libh2o_dir)/deps/libyrmcds/strerror.c \
-    $(libh2o_dir)/deps/libyrmcds/text_mode.c \
-    $(libh2o_dir)/deps/picohttpparser/picohttpparser.c \
-    $(libh2o_dir)/lib/common/cache.c \
-    $(libh2o_dir)/lib/common/file.c \
-    $(libh2o_dir)/lib/common/filecache.c \
-    $(libh2o_dir)/lib/common/hostinfo.c \
-    $(libh2o_dir)/lib/common/http1client.c \
-    $(libh2o_dir)/lib/common/memcached.c \
-    $(libh2o_dir)/lib/common/memory.c \
-    $(libh2o_dir)/lib/common/multithread.c \
-    $(libh2o_dir)/lib/common/serverutil.c \
-    $(libh2o_dir)/lib/common/socket.c \
-    $(libh2o_dir)/lib/common/socketpool.c \
-    $(libh2o_dir)/lib/common/string.c \
-    $(libh2o_dir)/lib/common/time.c \
-    $(libh2o_dir)/lib/common/timeout.c \
-    $(libh2o_dir)/lib/common/url.c \
-    $(libh2o_dir)/lib/core/config.c \
-    $(libh2o_dir)/lib/core/configurator.c \
-    $(libh2o_dir)/lib/core/context.c \
-    $(libh2o_dir)/lib/core/headers.c \
-    $(libh2o_dir)/lib/core/logconf.c \
-    $(libh2o_dir)/lib/core/proxy.c \
-    $(libh2o_dir)/lib/core/request.c \
-    $(libh2o_dir)/lib/core/token.c \
-    $(libh2o_dir)/lib/core/util.c \
-    $(libh2o_dir)/lib/handler/access_log.c \
-    $(libh2o_dir)/lib/handler/chunked.c \
-    $(libh2o_dir)/lib/handler/compress.c \
-    $(libh2o_dir)/lib/handler/compress/gzip.c \
-    $(libh2o_dir)/lib/handler/errordoc.c \
-    $(libh2o_dir)/lib/handler/expires.c \
-    $(libh2o_dir)/lib/handler/fastcgi.c \
-    $(libh2o_dir)/lib/handler/file.c \
-    $(libh2o_dir)/lib/handler/headers.c \
-    $(libh2o_dir)/lib/handler/mimemap.c \
-    $(libh2o_dir)/lib/handler/proxy.c \
-    $(libh2o_dir)/lib/handler/redirect.c \
-    $(libh2o_dir)/lib/handler/reproxy.c \
-    $(libh2o_dir)/lib/handler/throttle_resp.c \
-    $(libh2o_dir)/lib/handler/status.c \
-    $(libh2o_dir)/lib/handler/headers_util.c \
-    $(libh2o_dir)/lib/handler/status/events.c \
-    $(libh2o_dir)/lib/handler/status/requests.c \
-    $(libh2o_dir)/lib/handler/http2_debug_state.c \
-    $(libh2o_dir)/lib/handler/status/durations.c \
-    $(libh2o_dir)/lib/handler/configurator/access_log.c \
-    $(libh2o_dir)/lib/handler/configurator/compress.c \
-    $(libh2o_dir)/lib/handler/configurator/errordoc.c \
-    $(libh2o_dir)/lib/handler/configurator/expires.c \
-    $(libh2o_dir)/lib/handler/configurator/fastcgi.c \
-    $(libh2o_dir)/lib/handler/configurator/file.c \
-    $(libh2o_dir)/lib/handler/configurator/headers.c \
-    $(libh2o_dir)/lib/handler/configurator/proxy.c \
-    $(libh2o_dir)/lib/handler/configurator/redirect.c \
-    $(libh2o_dir)/lib/handler/configurator/reproxy.c \
-    $(libh2o_dir)/lib/handler/configurator/throttle_resp.c \
-    $(libh2o_dir)/lib/handler/configurator/status.c \
-    $(libh2o_dir)/lib/handler/configurator/http2_debug_state.c \
-    $(libh2o_dir)/lib/handler/configurator/headers_util.c \
-    $(libh2o_dir)/lib/http1.c \
-    $(libh2o_dir)/lib/tunnel.c \
-    $(libh2o_dir)/lib/http2/cache_digests.c \
-    $(libh2o_dir)/lib/http2/casper.c \
-    $(libh2o_dir)/lib/http2/connection.c \
-    $(libh2o_dir)/lib/http2/frame.c \
-    $(libh2o_dir)/lib/http2/hpack.c \
-    $(libh2o_dir)/lib/http2/scheduler.c \
-    $(libh2o_dir)/lib/http2/stream.c \
-    $(libh2o_dir)/lib/http2/http2_debug_state.c \
+    httpd/h2o/deps/cloexec/cloexec.c \
+    httpd/h2o/deps/libgkc/gkc.c \
+    httpd/h2o/deps/libyrmcds/close.c \
+    httpd/h2o/deps/libyrmcds/connect.c \
+    httpd/h2o/deps/libyrmcds/recv.c \
+    httpd/h2o/deps/libyrmcds/send.c \
+    httpd/h2o/deps/libyrmcds/send_text.c \
+    httpd/h2o/deps/libyrmcds/socket.c \
+    httpd/h2o/deps/libyrmcds/strerror.c \
+    httpd/h2o/deps/libyrmcds/text_mode.c \
+    httpd/h2o/deps/picohttpparser/picohttpparser.c \
+    httpd/h2o/lib/common/cache.c \
+    httpd/h2o/lib/common/file.c \
+    httpd/h2o/lib/common/filecache.c \
+    httpd/h2o/lib/common/hostinfo.c \
+    httpd/h2o/lib/common/http1client.c \
+    httpd/h2o/lib/common/memcached.c \
+    httpd/h2o/lib/common/memory.c \
+    httpd/h2o/lib/common/multithread.c \
+    httpd/h2o/lib/common/serverutil.c \
+    httpd/h2o/lib/common/socket.c \
+    httpd/h2o/lib/common/socketpool.c \
+    httpd/h2o/lib/common/string.c \
+    httpd/h2o/lib/common/time.c \
+    httpd/h2o/lib/common/timeout.c \
+    httpd/h2o/lib/common/url.c \
+    httpd/h2o/lib/core/config.c \
+    httpd/h2o/lib/core/configurator.c \
+    httpd/h2o/lib/core/context.c \
+    httpd/h2o/lib/core/headers.c \
+    httpd/h2o/lib/core/logconf.c \
+    httpd/h2o/lib/core/proxy.c \
+    httpd/h2o/lib/core/request.c \
+    httpd/h2o/lib/core/token.c \
+    httpd/h2o/lib/core/util.c \
+    httpd/h2o/lib/handler/access_log.c \
+    httpd/h2o/lib/handler/chunked.c \
+    httpd/h2o/lib/handler/compress.c \
+    httpd/h2o/lib/handler/compress/gzip.c \
+    httpd/h2o/lib/handler/errordoc.c \
+    httpd/h2o/lib/handler/expires.c \
+    httpd/h2o/lib/handler/fastcgi.c \
+    httpd/h2o/lib/handler/file.c \
+    httpd/h2o/lib/handler/headers.c \
+    httpd/h2o/lib/handler/mimemap.c \
+    httpd/h2o/lib/handler/proxy.c \
+    httpd/h2o/lib/handler/redirect.c \
+    httpd/h2o/lib/handler/reproxy.c \
+    httpd/h2o/lib/handler/throttle_resp.c \
+    httpd/h2o/lib/handler/status.c \
+    httpd/h2o/lib/handler/headers_util.c \
+    httpd/h2o/lib/handler/status/events.c \
+    httpd/h2o/lib/handler/status/requests.c \
+    httpd/h2o/lib/handler/http2_debug_state.c \
+    httpd/h2o/lib/handler/status/durations.c \
+    httpd/h2o/lib/handler/configurator/access_log.c \
+    httpd/h2o/lib/handler/configurator/compress.c \
+    httpd/h2o/lib/handler/configurator/errordoc.c \
+    httpd/h2o/lib/handler/configurator/expires.c \
+    httpd/h2o/lib/handler/configurator/fastcgi.c \
+    httpd/h2o/lib/handler/configurator/file.c \
+    httpd/h2o/lib/handler/configurator/headers.c \
+    httpd/h2o/lib/handler/configurator/proxy.c \
+    httpd/h2o/lib/handler/configurator/redirect.c \
+    httpd/h2o/lib/handler/configurator/reproxy.c \
+    httpd/h2o/lib/handler/configurator/throttle_resp.c \
+    httpd/h2o/lib/handler/configurator/status.c \
+    httpd/h2o/lib/handler/configurator/http2_debug_state.c \
+    httpd/h2o/lib/handler/configurator/headers_util.c \
+    httpd/h2o/lib/http1.c \
+    httpd/h2o/lib/tunnel.c \
+    httpd/h2o/lib/http2/cache_digests.c \
+    httpd/h2o/lib/http2/casper.c \
+    httpd/h2o/lib/http2/connection.c \
+    httpd/h2o/lib/http2/frame.c \
+    httpd/h2o/lib/http2/hpack.c \
+    httpd/h2o/lib/http2/scheduler.c \
+    httpd/h2o/lib/http2/stream.c \
+    httpd/h2o/lib/http2/http2_debug_state.c \
     $(NULL)
 
 libh2o_a_INCLUDES = \
-    -I$(srcdir)/$(libh2o_dir)/include \
-    -I$(srcdir)/$(libh2o_dir)/deps/cloexec \
-    -I$(srcdir)/$(libh2o_dir)/deps/brotli/enc \
-    -I$(srcdir)/$(libh2o_dir)/deps/golombset \
-    -I$(srcdir)/$(libh2o_dir)/deps/libgkc \
-    -I$(srcdir)/$(libh2o_dir)/deps/libyrmcds \
-    -I$(srcdir)/$(libh2o_dir)/deps/klib \
-    -I$(srcdir)/$(libh2o_dir)/deps/neverbleed \
-    -I$(srcdir)/$(libh2o_dir)/deps/picohttpparser \
-    -I$(srcdir)/$(libh2o_dir)/deps/picotest \
-    -I$(srcdir)/$(libh2o_dir)/deps/yaml/include \
-    -I$(srcdir)/$(libh2o_dir)/deps/yoml \
+    -I$(srcdir)/httpd/h2o/include \
+    -I$(srcdir)/httpd/h2o/deps/cloexec \
+    -I$(srcdir)/httpd/h2o/deps/brotli/enc \
+    -I$(srcdir)/httpd/h2o/deps/golombset \
+    -I$(srcdir)/httpd/h2o/deps/libgkc \
+    -I$(srcdir)/httpd/h2o/deps/libyrmcds \
+    -I$(srcdir)/httpd/h2o/deps/klib \
+    -I$(srcdir)/httpd/h2o/deps/neverbleed \
+    -I$(srcdir)/httpd/h2o/deps/picohttpparser \
+    -I$(srcdir)/httpd/h2o/deps/picotest \
+    -I$(srcdir)/httpd/h2o/deps/yaml/include \
+    -I$(srcdir)/httpd/h2o/deps/yoml \
     $(NULL)
 
 if ENABLE_HTTPD