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 2010/03/15 22:00:19 UTC
svn commit: r923438 - in /incubator/trafficserver/traffic/branches/2.0.x:
STATUS configure.ac proxy/http2/remap/UrlRewrite.h
Author: zwoop
Date: Mon Mar 15 21:00:18 2010
New Revision: 923438
URL: http://svn.apache.org/viewvc?rev=923438&view=rev
Log:
TS-234: <pcre/prec.h> support, backported from trunk.
Modified:
incubator/trafficserver/traffic/branches/2.0.x/STATUS
incubator/trafficserver/traffic/branches/2.0.x/configure.ac
incubator/trafficserver/traffic/branches/2.0.x/proxy/http2/remap/UrlRewrite.h
Modified: incubator/trafficserver/traffic/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/STATUS?rev=923438&r1=923437&r2=923438&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/STATUS (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/STATUS Mon Mar 15 21:00:18 2010
@@ -49,13 +49,6 @@ For the final 2.0.0 ATS release, see the
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
- * build: Support platforms with pcre/pcre.h instead of pcre.h
- This is already committed to trunk, as part of a massive merge from
- the dev branch. I've backported just this single change, which is
- attached to the Jira ticket.
- Jira: https://issues.apache.org/jira/browse/TS-234
- +1: zwoop, bcall, jplevyak, georgep
-
* core: url copy function should duplicate host fields
Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=921639
Jira: https://issues.apache.org/jira/browse/TS-236
Modified: incubator/trafficserver/traffic/branches/2.0.x/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/configure.ac?rev=923438&r1=923437&r2=923438&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/configure.ac (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/configure.ac Mon Mar 15 21:00:18 2010
@@ -607,6 +607,9 @@ AC_CHECK_HEADERS([sys/epoll.h \
sys/param.h \
], [], [])
+AC_CHECK_HEADERS([pcre/pcre.h],
+ [], [],[])
+
if test "x${with_libdb}" = "xyes"; then
AC_CHECK_HEADERS([db_185.h \
db.h \
Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/http2/remap/UrlRewrite.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/http2/remap/UrlRewrite.h?rev=923438&r1=923437&r2=923438&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/http2/remap/UrlRewrite.h (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/http2/remap/UrlRewrite.h Mon Mar 15 21:00:18 2010
@@ -27,7 +27,11 @@
#include "StringHash.h"
#include "UrlMapping.h"
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
#include <pcre.h>
+#endif
#include <list>
#define URL_REMAP_FILTER_NONE 0x00000000