TS-1860 cacheurl doesn't compile on platforms with pcre/pcre.h (e.g. solaris).
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d1bb9ed9 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d1bb9ed9 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d1bb9ed9 Branch: refs/heads/master Commit: d1bb9ed9e1f12de3f97c0c5101e848c96e2a18da Parents: 854c6c1 Author: Leif Hedstrom <zw...@apache.org> Authored: Sun Apr 28 13:54:53 2013 -0600 Committer: Leif Hedstrom <zw...@apache.org> Committed: Sun Apr 28 13:54:53 2013 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ plugins/experimental/cacheurl/cacheurl.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1bb9ed9/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index b1a039e..8691daf 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache Traffic Server 3.3.3 + *) [TS-1860] cacheurl doesn't compile on platforms with pcre/pcre.h + (e.g. solaris). + *) [TS-1729] Fix channel_stats to compile on various Unixen. Note that this is still IPV4 only. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d1bb9ed9/plugins/experimental/cacheurl/cacheurl.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/cacheurl/cacheurl.c b/plugins/experimental/cacheurl/cacheurl.c index 4d330ed..fff57a8 100644 --- a/plugins/experimental/cacheurl/cacheurl.c +++ b/plugins/experimental/cacheurl/cacheurl.c @@ -23,9 +23,16 @@ */ #include <stdio.h> -#include <pcre.h> #include <string.h> +#include "ink_config.h" + +#ifdef HAVE_PCRE_PCRE_H +#include <pcre/pcre.h> +#else +#include <pcre.h> +#endif + #include "ts/ts.h" #include "ts/remap.h" #include "ink_defs.h"
