You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/07/19 18:25:00 UTC
git commit: TS-2050 Remove unused stuff from ink_config.h.in,
also make reverse proxy always there
Updated Branches:
refs/heads/master 791466d3a -> 329d69f09
TS-2050 Remove unused stuff from ink_config.h.in, also make reverse proxy always there
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/329d69f0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/329d69f0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/329d69f0
Branch: refs/heads/master
Commit: 329d69f092ee111bf9ef527046d61553ed55f54a
Parents: 791466d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jul 19 10:24:52 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Jul 19 10:24:52 2013 -0600
----------------------------------------------------------------------
CHANGES | 6 +++++-
build/network.m4 | 9 +--------
configure.ac | 3 ---
lib/ts/ink_config.h.in | 7 +------
proxy/http/HttpProxyServerMain.cc | 2 --
5 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/329d69f0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d6889d8..d8a2500 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.5
- *) [TS-1487] [TS-2035] Moved plugin init, added plugin lifecycle hooks, added delay listen for cache. Removed TS_NO_API defined/build option.
+
+ *) [TS-2050] Cleanup ink_config.h.in, removing unused symbols.
+
+ *) [TS-1487] [TS-2035] Moved plugin init, added plugin lifecycle hooks,
+ added delay listen for cache. Removed TS_NO_API defined/build option.
*) [TS-2047] Schedule RamCacheCLFUSCompressor in RamCacheCLFUS::init instead
of immediatly after instantiation.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/329d69f0/build/network.m4
----------------------------------------------------------------------
diff --git a/build/network.m4 b/build/network.m4
index 44f7dc1..a71390e 100644
--- a/build/network.m4
+++ b/build/network.m4
@@ -84,14 +84,7 @@ int tmp = gethostbyname_r((const char *) 0, (struct hostent *) 0,
tmp=0;
], ac_cv_gethostbyname_r_arg=hostent_data, ac_cv_gethostbyname_r_arg=char))
-if test "$ac_cv_gethostbyname_r_arg" = "hostent_data"; then
- gethostbyname_r_hostent_data=1
- AC_DEFINE(GETHOSTBYNAME_R_HOSTENT_DATA, 1, [Define if gethostbyname_r has the hostent_data for the third argument])
-else
- gethostbyname_r_hostent_data=0
-fi
AC_SUBST(gethostbyname_r_glibc2)
-AC_SUBST(gethostbyname_r_hostent_data)
])
dnl
@@ -129,4 +122,4 @@ if test "x$ac_cv_macro_in6_is_addr_unspecified" = "xno"; then
has_in6_is_addr_unspecified=0
fi
AC_SUBST(has_in6_is_addr_unspecified)
-])
\ No newline at end of file
+])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/329d69f0/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 0d2285a..16c8abf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1170,7 +1170,6 @@ if test "x${with_profiler}" = "xyes"; then
fi
AC_SUBST(has_profiler)
-has_demangle=0
# For SunPro 5.2 - we need the demangle symbol for
# ink_stack_trace.cc in lib/ts. Because this
# library is part of the SunPro distribution, we need
@@ -1179,12 +1178,10 @@ has_demangle=0
AC_LANG_PUSH([C++])
AC_SEARCH_LIBS([cplus_demangle],[demangle],
[LIBDEMANGLE="-ldemangle"
- has_demangle=1
]
)
AC_SUBST([LIBDEMANGLE])
AC_LANG_POP
-AC_SUBST(has_demangle)
AC_MSG_CHECKING(for 128bit CAS support)
AC_LANG_PUSH([C++])
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/329d69f0/lib/ts/ink_config.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index b8e59c4..989b23a 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -45,14 +45,12 @@
/* Libraries */
#define TS_HAS_LIBZ @zlibh@
#define TS_HAS_LZMA @lzmah@
-#define TS_HAS_EXPAT @expath@
#define TS_HAS_JEMALLOC @jemalloch@
#define TS_HAS_TCMALLOC @has_tcmalloc@
/* Features */
#define TS_HAS_IN6_IS_ADDR_UNSPECIFIED @has_in6_is_addr_unspecified@
-
#define TS_HAS_BACKTRACE @has_backtrace@
#define TS_HAS_PROFILER @has_profiler@
#define TS_USE_FAST_SDK @use_fast_sdk@
@@ -72,11 +70,10 @@
#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
#define TS_USE_COP_DEBUG @use_cop_debug@
#define TS_USE_MAXMIND_GEOIP @use_maxmind_geoip@
-#define TS_USE_INTERIM_CACHE @has_interim_cache@
+#define TS_USE_INTERIM_CACHE @has_interim_cache@
/* OS API definitions */
-#define GETHOSTBYNAME_R_HOSTENT_DATA @gethostbyname_r_hostent_data@
#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
#define TS_IP_TRANSPARENT @ip_transparent@
@@ -85,7 +82,6 @@
/* API */
#define TS_IS_MICRO_BUILD @is_micro_build@
#define TS_HAS_STANDALONE_IOCORE @has_standalone_iocore@
-#define TS_HAS_DEMANGLE @has_demangle@
#define TS_HAS_TESTS @has_tests@
#define TS_HAS_WCCP @has_wccp@
@@ -99,7 +95,6 @@
# define INK_NO_HOSTDB 1
# define INK_NO_ICP 1
# define INK_NO_LOG 1
-# define INK_NO_REVERSE 1
# define INK_NO_SOCKS 1
# define INK_NO_STAT_PAGES 1
# define INK_USE_MUTEX_FOR_ATOMICLISTS 1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/329d69f0/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 485ce96..1ee1d6e 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -182,9 +182,7 @@ init_HttpProxyServer(int n_accept_threads)
{
HttpProxyPort::Group& proxy_ports = HttpProxyPort::global();
-#ifndef INK_NO_REVERSE
init_reverse_proxy();
-#endif
httpSessionManager.init();
http_pages_init();
ink_mutex_init(&debug_sm_list_mutex, "HttpSM Debug List");