TS-3824 Fix #include of pcre for a couple of plugins (cherry picked from commit 0c28aa665ddf633171884a9ca0a90e89ade71ce5) (cherry picked from commit 8939a3c68691137751fa11687b4b891505d8e510)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fde5ff38 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fde5ff38 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fde5ff38 Branch: refs/heads/5.3.x Commit: fde5ff38112daf2cf9794638968a72a346f04c0e Parents: 957f28c Author: Leif Hedstrom <[email protected]> Authored: Wed Aug 5 20:18:09 2015 -0600 Committer: Phil Sorber <[email protected]> Committed: Wed Sep 2 11:06:36 2015 -0600 ---------------------------------------------------------------------- plugins/experimental/geoip_acl/acl.h | 5 +++++ plugins/experimental/url_sig/url_sig.c | 1 + plugins/experimental/url_sig/url_sig.h | 1 - plugins/header_rewrite/regex_helper.h | 6 ++++++ 4 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fde5ff38/plugins/experimental/geoip_acl/acl.h ---------------------------------------------------------------------- diff --git a/plugins/experimental/geoip_acl/acl.h b/plugins/experimental/geoip_acl/acl.h index 81c35cf..e9be954 100644 --- a/plugins/experimental/geoip_acl/acl.h +++ b/plugins/experimental/geoip_acl/acl.h @@ -21,7 +21,12 @@ #include <ts/ts.h> #include <ts/remap.h> + +#ifdef HAVE_PCRE_PCRE_H +#include <pcre/pcre.h> +#else #include <pcre.h> +#endif #include <string> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fde5ff38/plugins/experimental/url_sig/url_sig.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/url_sig/url_sig.c b/plugins/experimental/url_sig/url_sig.c index 43fdef0..672f2c5 100644 --- a/plugins/experimental/url_sig/url_sig.c +++ b/plugins/experimental/url_sig/url_sig.c @@ -16,6 +16,7 @@ limitations under the License. */ +#include "ts/ink_defs.h" #include "url_sig.h" #include <stdio.h> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fde5ff38/plugins/experimental/url_sig/url_sig.h ---------------------------------------------------------------------- diff --git a/plugins/experimental/url_sig/url_sig.h b/plugins/experimental/url_sig/url_sig.h index 45fe462..d27ddf2 100644 --- a/plugins/experimental/url_sig/url_sig.h +++ b/plugins/experimental/url_sig/url_sig.h @@ -19,7 +19,6 @@ #ifndef URL_SIG_H_ #define URL_SIG_H_ -#define VERSION "1.0" /* in the query string that we add to sign the url: */ #define CIP_QSTRING "C" /* C=24.0.33.12 designates the client IP address */ #define EXP_QSTRING "E" /* E=1356128799 means expires at (seconds since Unix epoch) */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fde5ff38/plugins/header_rewrite/regex_helper.h ---------------------------------------------------------------------- diff --git a/plugins/header_rewrite/regex_helper.h b/plugins/header_rewrite/regex_helper.h index 45b061c..6be153a 100644 --- a/plugins/header_rewrite/regex_helper.h +++ b/plugins/header_rewrite/regex_helper.h @@ -18,7 +18,13 @@ #ifndef REGEX_HELPER_H #define REGEX_HELPER_H +#include "ts/ink_defs.h" + +#ifdef HAVE_PCRE_PCRE_H +#include <pcre/pcre.h> +#else #include <pcre.h> +#endif #include <string>
