You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/03/29 19:17:47 UTC
mesos git commit: Changed name of http-parser enum to 'flags_enum'.
Repository: mesos
Updated Branches:
refs/heads/master 8d2368c66 -> 7c6a750a8
Changed name of http-parser enum to 'flags_enum'.
Needed this because it conflicts with stout's flags namespace.
Review: https://reviews.apache.org/r/45397/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c6a750a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c6a750a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c6a750a
Branch: refs/heads/master
Commit: 7c6a750a85becabbaa5c118c3735020400f11c39
Parents: 8d2368c
Author: Greg Mann <gr...@mesosphere.io>
Authored: Mon Mar 28 14:56:56 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Mar 29 10:17:17 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 2 +-
3rdparty/libprocess/3rdparty/Makefile.am | 4 ++++
3rdparty/libprocess/3rdparty/http-parser-2.6.1.patch | 13 +++++++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c6a750a/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index 04a4cf4..c3dcbb5 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -121,7 +121,7 @@ if (NOT WIN32)
elseif (WIN32)
# Set the patch command which will utilize patch.exe under
# `\Users\<user>\AppData\Local\Temp with no elevation prompt`
- set(HTTP_PARSER_PATCH_CMD ${PATCHEXE_LOCATION} --binary -p1 < ${PROCESS_3RD_SRC}/ry-http-parser-${HTTP_PARSER_VERSION}.patch)
+ set(HTTP_PARSER_PATCH_CMD ${PATCHEXE_LOCATION} --binary -p1 < ${PROCESS_3RD_SRC}/http-parser-${HTTP_PARSER_VERSION}.patch)
endif (NOT WIN32)
set(LIBEVENT_CMAKE_ARGS
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c6a750a/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 385302a..217283c 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -58,6 +58,10 @@ EXTRA_DIST += \
EXTRA_DIST += \
$(LIBEV).patch
+# We patch http-parser to avoid a name collision with our `flags` namespace.
+EXTRA_DIST += \
+ $(HTTP_PARSER).patch
+
CLEAN_EXTRACTED = \
$(BOOST) \
$(GLOG) \
http://git-wip-us.apache.org/repos/asf/mesos/blob/7c6a750a/3rdparty/libprocess/3rdparty/http-parser-2.6.1.patch
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/http-parser-2.6.1.patch b/3rdparty/libprocess/3rdparty/http-parser-2.6.1.patch
new file mode 100644
index 0000000..2877597
--- /dev/null
+++ b/3rdparty/libprocess/3rdparty/http-parser-2.6.1.patch
@@ -0,0 +1,13 @@
+diff --git a/http_parser.h b/http_parser.h
+index e33c062..a816545 100644
+--- a/http_parser.h
++++ b/http_parser.h
+@@ -140,7 +140,7 @@ enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
+
+
+ /* Flag values for http_parser.flags field */
+-enum flags
++enum flags_enum
+ { F_CHUNKED = 1 << 0
+ , F_CONNECTION_KEEP_ALIVE = 1 << 1
+ , F_CONNECTION_CLOSE = 1 << 2