Merge pull request #15 from appnexus/http-parser-submodule

Remove copied http-parser code and use as submodule
appnexus · Apr 13, 2018 · 4ac4618 · 4ac4618
2 parents 8382bdc + a4c2d89
commit 4ac4618
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 2 deletions.
diff --git a/common/an_server.c b/common/an_server.c
@@ -22,7 +22,6 @@
 #include <ck_ring.h>
 
 #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
@@ -4,8 +4,8 @@
 #include <netinet/in.h>
 #include <stdint.h>
 
-#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 → third_party/http-parser/AUTHORS b/common/net/protocol/http-parser/AUTHORS → third_party/http-parser/AUTHORS
diff --git a/common/net/protocol/http-parser/LICENSE-MIT → third_party/http-parser/LICENSE-MIT b/common/net/protocol/http-parser/LICENSE-MIT → third_party/http-parser/LICENSE-MIT
diff --git a/common/net/protocol/http-parser/Makefile → third_party/http-parser/Makefile b/common/net/protocol/http-parser/Makefile → third_party/http-parser/Makefile
diff --git a/common/net/protocol/http-parser/README.md → third_party/http-parser/README.md b/common/net/protocol/http-parser/README.md → third_party/http-parser/README.md
diff --git a/common/net/protocol/http-parser/bench.c → third_party/http-parser/bench.c b/common/net/protocol/http-parser/bench.c → third_party/http-parser/bench.c
diff --git a/...rotocol/http-parser/contrib/parsertrace.c → ...d_party/http-parser/contrib/parsertrace.c b/...rotocol/http-parser/contrib/parsertrace.c → ...d_party/http-parser/contrib/parsertrace.c
diff --git a/...protocol/http-parser/contrib/url_parser.c → third_party/http-parser/contrib/url_parser.c b/...protocol/http-parser/contrib/url_parser.c → third_party/http-parser/contrib/url_parser.c
diff --git a/...on/net/protocol/http-parser/http_parser.c → third_party/http-parser/http_parser.c b/...on/net/protocol/http-parser/http_parser.c → third_party/http-parser/http_parser.c
diff --git a/.../net/protocol/http-parser/http_parser.gyp → third_party/http-parser/http_parser.gyp b/.../net/protocol/http-parser/http_parser.gyp → third_party/http-parser/http_parser.gyp
diff --git a/...on/net/protocol/http-parser/http_parser.h → third_party/http-parser/http_parser.h b/...on/net/protocol/http-parser/http_parser.h → third_party/http-parser/http_parser.h
diff --git a/common/net/protocol/http-parser/test.c → third_party/http-parser/test.c b/common/net/protocol/http-parser/test.c → third_party/http-parser/test.c