Updated Branches: refs/heads/master 00bb63ce3 -> 12ce45131
TS-1194 Also fix a few plugins to use the core build infrastructure Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/12ce4513 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/12ce4513 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/12ce4513 Branch: refs/heads/master Commit: 12ce4513161f8d8ee35ecabfcafc6b69b15a197b Parents: 0aa9dda Author: Leif Hedstrom <[email protected]> Authored: Mon Apr 9 14:12:02 2012 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Mon Apr 9 14:12:02 2012 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ plugins/header_filter/header_filter.cc | 6 ++++-- plugins/header_filter/rules.h | 10 +++++++++- plugins/regex_remap/regex_remap.cc | 13 ++++++++++--- 4 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12ce4513/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 1192fc8..fc05b04 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.1.4 + *) [TS-1194 Change conversions to build with gcc-4.6 on OmniOS/Solaris. + Also cleanup a couple of plugins to use our "core" build environment. + *) [TS-1192] Remove gethostbyname usage in test code *) [TS-1147] deprecate records.config SSL configuration http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12ce4513/plugins/header_filter/header_filter.cc ---------------------------------------------------------------------- diff --git a/plugins/header_filter/header_filter.cc b/plugins/header_filter/header_filter.cc index 48425d1..dc7584b 100644 --- a/plugins/header_filter/header_filter.cc +++ b/plugins/header_filter/header_filter.cc @@ -21,8 +21,10 @@ // // Main entry points for the plugin hooks etc. // -#include <ts/ts.h> -#include <ts/remap.h> +#include "ts/ts.h" +#include "ts/remap.h" +#include "ink_config.h" + #include <stdio.h> #include "rules.h" http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12ce4513/plugins/header_filter/rules.h ---------------------------------------------------------------------- diff --git a/plugins/header_filter/rules.h b/plugins/header_filter/rules.h index 556e4c2..70e3756 100644 --- a/plugins/header_filter/rules.h +++ b/plugins/header_filter/rules.h @@ -24,10 +24,18 @@ #ifndef __RULES_H__ #define __RULES_H__ 1 +#include "ts/ts.h" +#include "ink_config.h" + #include <string> #include <string.h> -#include <ts/ts.h> + +#ifdef HAVE_PCRE_PCRE_H +#include <pcre/pcre.h> +#else #include <pcre.h> +#endif + #include "lulu.h" namespace HeaderFilter { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/12ce4513/plugins/regex_remap/regex_remap.cc ---------------------------------------------------------------------- diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc index a66eed9..2cfea6d 100644 --- a/plugins/regex_remap/regex_remap.cc +++ b/plugins/regex_remap/regex_remap.cc @@ -24,17 +24,24 @@ #define UNUSED __attribute__ ((unused)) static char UNUSED rcsId__regex_remap_cc[] = "@(#) $Id$ built on " __DATE__ " " __TIME__; +#include "ts/ts.h" +#include "ts/remap.h" +#include "ink_config.h" + #include <sys/types.h> #include <stdio.h> #include <time.h> #include <string.h> + +#ifdef HAVE_PCRE_PCRE_H +#include <pcre/pcre.h> +#else #include <pcre.h> +#endif + #include <ctype.h> #include <unistd.h> -#include <ts/ts.h> -#include <ts/remap.h> - #include <iostream> #include <fstream> #include <string>
