From a4c2d89898d5ec34e00dfb96df150c18a23ab6d3 Mon Sep 17 00:00:00 2001 From: Mike Wright Date: Fri, 13 Apr 2018 14:16:42 +0000 Subject: [PATCH] Remove copied http-parser code and use as submodule --- common/an_server.c | 2 +- common/an_server.h | 2 +- {common/net/protocol => third_party}/http-parser/AUTHORS | 0 {common/net/protocol => third_party}/http-parser/LICENSE-MIT | 0 {common/net/protocol => third_party}/http-parser/Makefile | 0 {common/net/protocol => third_party}/http-parser/README.md | 0 {common/net/protocol => third_party}/http-parser/bench.c | 0 .../protocol => third_party}/http-parser/contrib/parsertrace.c | 0 .../protocol => third_party}/http-parser/contrib/url_parser.c | 0 {common/net/protocol => third_party}/http-parser/http_parser.c | 0 .../net/protocol => third_party}/http-parser/http_parser.gyp | 0 {common/net/protocol => third_party}/http-parser/http_parser.h | 0 {common/net/protocol => third_party}/http-parser/test.c | 0 13 files changed, 2 insertions(+), 2 deletions(-) rename {common/net/protocol => third_party}/http-parser/AUTHORS (100%) rename {common/net/protocol => third_party}/http-parser/LICENSE-MIT (100%) rename {common/net/protocol => third_party}/http-parser/Makefile (100%) rename {common/net/protocol => third_party}/http-parser/README.md (100%) rename {common/net/protocol => third_party}/http-parser/bench.c (100%) rename {common/net/protocol => third_party}/http-parser/contrib/parsertrace.c (100%) rename {common/net/protocol => third_party}/http-parser/contrib/url_parser.c (100%) rename {common/net/protocol => third_party}/http-parser/http_parser.c (100%) rename {common/net/protocol => third_party}/http-parser/http_parser.gyp (100%) rename {common/net/protocol => third_party}/http-parser/http_parser.h (100%) rename {common/net/protocol => third_party}/http-parser/test.c (100%) diff --git a/common/an_server.c b/common/an_server.c index fc10a36..7d14224 100644 --- a/common/an_server.c +++ b/common/an_server.c @@ -22,7 +22,6 @@ #include #include "common/memory/pool.h" -#include "common/net/protocol/http-parser/http_parser.h" #include "common/rtbr/rtbr.h" #include "common/an_array.h" #include "common/an_buf_http.h" @@ -35,6 +34,7 @@ #include "common/an_syslog.h" #include "common/server_config.h" #include "common/util.h" +#include "third_party/http-parser/http_parser.h" #define INITIAL_BUFFER_SIZE 4096ULL #define INITIAL_NUM_EVENTS 64ULL diff --git a/common/an_server.h b/common/an_server.h index 4e97111..3e2e0ab 100644 --- a/common/an_server.h +++ b/common/an_server.h @@ -4,8 +4,8 @@ #include #include -#include "common/net/protocol/http-parser/http_parser.h" #include "common/an_array.h" +#include "third_party/http-parser/http_parser.h" #define AN_IO_CONNECTIONS_MAX (1U << 28) #define AN_IO_THREADS_MAX (1U << 8) diff --git a/common/net/protocol/http-parser/AUTHORS b/third_party/http-parser/AUTHORS similarity index 100% rename from common/net/protocol/http-parser/AUTHORS rename to third_party/http-parser/AUTHORS diff --git a/common/net/protocol/http-parser/LICENSE-MIT b/third_party/http-parser/LICENSE-MIT similarity index 100% rename from common/net/protocol/http-parser/LICENSE-MIT rename to third_party/http-parser/LICENSE-MIT diff --git a/common/net/protocol/http-parser/Makefile b/third_party/http-parser/Makefile similarity index 100% rename from common/net/protocol/http-parser/Makefile rename to third_party/http-parser/Makefile diff --git a/common/net/protocol/http-parser/README.md b/third_party/http-parser/README.md similarity index 100% rename from common/net/protocol/http-parser/README.md rename to third_party/http-parser/README.md diff --git a/common/net/protocol/http-parser/bench.c b/third_party/http-parser/bench.c similarity index 100% rename from common/net/protocol/http-parser/bench.c rename to third_party/http-parser/bench.c diff --git a/common/net/protocol/http-parser/contrib/parsertrace.c b/third_party/http-parser/contrib/parsertrace.c similarity index 100% rename from common/net/protocol/http-parser/contrib/parsertrace.c rename to third_party/http-parser/contrib/parsertrace.c diff --git a/common/net/protocol/http-parser/contrib/url_parser.c b/third_party/http-parser/contrib/url_parser.c similarity index 100% rename from common/net/protocol/http-parser/contrib/url_parser.c rename to third_party/http-parser/contrib/url_parser.c diff --git a/common/net/protocol/http-parser/http_parser.c b/third_party/http-parser/http_parser.c similarity index 100% rename from common/net/protocol/http-parser/http_parser.c rename to third_party/http-parser/http_parser.c diff --git a/common/net/protocol/http-parser/http_parser.gyp b/third_party/http-parser/http_parser.gyp similarity index 100% rename from common/net/protocol/http-parser/http_parser.gyp rename to third_party/http-parser/http_parser.gyp diff --git a/common/net/protocol/http-parser/http_parser.h b/third_party/http-parser/http_parser.h similarity index 100% rename from common/net/protocol/http-parser/http_parser.h rename to third_party/http-parser/http_parser.h diff --git a/common/net/protocol/http-parser/test.c b/third_party/http-parser/test.c similarity index 100% rename from common/net/protocol/http-parser/test.c rename to third_party/http-parser/test.c