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/10/06 17:24:14 UTC
[1/4] git commit: TS-2207: CentOS5 out of tree perl module build fails
Updated Branches:
refs/heads/4.0.x b1d6a80d6 -> bbd283ef6
TS-2207: CentOS5 out of tree perl module build fails
The older version of automake on CentOS5 doesn't supply the $(builddir)
variable, possibly because it's implicitly the current working
directory. It also doesn't supply various $abs_ variables that later
versions do. Rewrite the copy using more fundamental automake
variables.
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1b38b3fd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1b38b3fd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1b38b3fd
Branch: refs/heads/4.0.x
Commit: 1b38b3fd5b050b2ddbfefd90a43311c506077c58
Parents: b1d6a80
Author: James Peach <jp...@apache.org>
Authored: Tue Sep 10 09:04:42 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 6 09:20:42 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
lib/perl/Makefile.am | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1b38b3fd/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2eb97a8..f34b679 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Changes with Apache Traffic Server 4.0.2
*) [TS-2217] remove the option to turn off body factory - setting it to 0 will
result in empty responses
+ *) [TS-2207] CentOS5 out of tree perl module build fails.
+
*) [TS-2191] not reschedule http_sm when the sm_list`s lock is not acquired.
*) [TS-2174] traffic_shell/traffic_line miss some stats value
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1b38b3fd/lib/perl/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index be6ea76..a389a14 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -22,8 +22,10 @@ all-local: Makefile-pl
install-exec-local: Makefile-pl
$(MAKE) -f Makefile-pl INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) DESTDIR=$(DESTDIR) install
+# The perl build needs to have the source files in the current working directory, so we need to
+# copy them to the build directory if we are building out of tree.
Makefile-pl: Makefile.PL
- -[ $(srcdir) != $(builddir) ] && cp -rf $(abs_srcdir)/. $(builddir)/.
+ -[ "$(srcdir)" != "$(top_builddir)/$(subdir)" ] && cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)"
$(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
#test: check
[3/4] git commit: TS-2144 Avoid race on e.g. -Cclear which would
crash the process
Posted by zw...@apache.org.
TS-2144 Avoid race on e.g. -Cclear which would crash the process
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/78729140
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/78729140
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/78729140
Branch: refs/heads/4.0.x
Commit: 787291407a11565d8ec6e6258ce9a04cc3419aa6
Parents: 4860d7b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Sep 13 10:45:04 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 6 09:22:44 2013 -0600
----------------------------------------------------------------------
proxy/Main.cc | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/78729140/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index be52f0a..be85e73 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -1521,17 +1521,13 @@ main(int /* argc ATS_UNUSED */, char **argv)
Note("using the new remap processor system with %d threads", num_remap_threads);
remapProcessor.setUseSeparateThread();
}
- remapProcessor.start(num_remap_threads, stacksize);
-
- RecProcessStart(stacksize);
init_signals2();
// log initialization moved down
if (command_flag) {
- // pmgmt initialization moved up, needed by RecProcessInit
- //pmgmt->start();
int cmd_ret = cmd_mode();
+
if (cmd_ret != CMD_IN_PROGRESS) {
if (cmd_ret >= 0)
_exit(0); // everything is OK
@@ -1539,6 +1535,8 @@ main(int /* argc ATS_UNUSED */, char **argv)
_exit(1); // in error
}
} else {
+ remapProcessor.start(num_remap_threads, stacksize);
+ RecProcessStart(stacksize);
initCacheControl();
initCongestionControl();
IpAllow::startup();
[2/4] git commit: TS-2207: stop using $(builddir) in automake
Posted by zw...@apache.org.
TS-2207: stop using $(builddir) in automake
Older automake (< 1.9?) doesn't emit $(builddir), but it's always
"." anyway, so let's use that instead.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4860d7ba
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4860d7ba
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4860d7ba
Branch: refs/heads/4.0.x
Commit: 4860d7ba4a8c281dad5ef278c2dd7eeb9f7671b0
Parents: 1b38b3f
Author: James Peach <jp...@apache.org>
Authored: Tue Sep 10 09:20:27 2013 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 6 09:21:16 2013 -0600
----------------------------------------------------------------------
lib/tsconfig/Makefile.am | 2 +-
proxy/Makefile.am | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4860d7ba/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index dde552f..4e33c6c 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -53,4 +53,4 @@ test_tsconfig_LDADD = libtsconfig.la ../ts/libtsutil.la
# Strip to just the enum in the ts::config namespace so we can use
# it more easily in C++.
TsConfigGrammar.hpp: TsConfigGrammar.h BisonHeaderToC++.sed
- $(SED) -f $(srcdir)/BisonHeaderToC++.sed $(builddir)/TsConfigGrammar.h > $@
+ $(SED) -f $(srcdir)/BisonHeaderToC++.sed TsConfigGrammar.h > $@
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4860d7ba/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index d26227e..2565100 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -50,8 +50,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/mgmt/preparse \
-I$(top_srcdir)/mgmt/utils \
-I$(srcdir)/api/ts \
- -I$(builddir) \
- -I$(builddir)/api/ts \
+ -I. \
+ -I./api/ts \
-I$(top_srcdir)/lib
noinst_HEADERS = \
[4/4] git commit: Added TS-2144.
Posted by zw...@apache.org.
Added TS-2144.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bbd283ef
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bbd283ef
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bbd283ef
Branch: refs/heads/4.0.x
Commit: bbd283ef6106a8cbbfde4803cdc14f51438866df
Parents: 7872914
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Sep 13 10:45:50 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sun Oct 6 09:22:56 2013 -0600
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bbd283ef/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f34b679..1ff9eb2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.0.2
+ *) [TS-2144] Avoid race on e.g. "traffic_server -Cclear" which would crash
+ the process intermittently.
+
*) [TS-2217] remove the option to turn off body factory - setting it to 0 will
result in empty responses