You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/08/12 03:21:22 UTC
[2/3] git commit: Revert "TS-2999: Add dscp_remap plugin to build and
update CHANGES and NOTICE"
Revert "TS-2999: Add dscp_remap plugin to build and update CHANGES and NOTICE"
This reverts commit 04699c5f7a2b22eaf987e58ceb1b0d89c22c06b6.
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ae4eb398
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ae4eb398
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ae4eb398
Branch: refs/heads/master
Commit: ae4eb398d7fe9e93c6a2c2bc659ac3c1dc8af119
Parents: ada9b72
Author: Phil Sorber <so...@apache.org>
Authored: Mon Aug 11 19:17:10 2014 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Mon Aug 11 19:17:10 2014 -0600
----------------------------------------------------------------------
CHANGES | 2 --
NOTICE | 2 +-
configure.ac | 1 -
plugins/experimental/Makefile.am | 1 -
plugins/experimental/dscp_remap/Makefile.am | 21 ---------------------
plugins/experimental/dscp_remap/dscp_remap.cc | 7 ++-----
6 files changed, 3 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 01e1522..053b4d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,8 +3,6 @@ Changes with Apache Traffic Server 5.1.0
*) [TS-3002] Add DSCP support to header_rewrite.
- *) [TS-2999] Add dscp_remap plugin to experimental plugins.
-
*) [TS-2564] Cherry pick for full cache compatibility.
*) [TS-2362] Make cache backwards compatible to 3.2.0.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 6cb75d7..6132ce6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -54,7 +54,7 @@ Copyright (c) 2013 LinkedIn
~~~
-remap_stats, url_sig and dscp_remap plugins developed by Comcast.
+remap_stats and url_sig plugins developed by Comcast.
Copyright (C) 2014 Comcast
~~~
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index b33413a..ef3a882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1935,7 +1935,6 @@ AS_IF([test "x$enable_experimental_plugins" = xyes], [
plugins/experimental/channel_stats/Makefile
plugins/experimental/collapsed_connection/Makefile
plugins/experimental/custom_redirect/Makefile
- plugins/experimental/dscp_remap/Makefile
plugins/experimental/epic/Makefile
plugins/experimental/escalate/Makefile
plugins/experimental/esi/Makefile
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/plugins/experimental/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index 5331719..57fec8c 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -22,7 +22,6 @@ SUBDIRS = \
channel_stats \
collapsed_connection \
custom_redirect \
- dscp_remap \
epic \
escalate \
esi \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/plugins/experimental/dscp_remap/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/dscp_remap/Makefile.am b/plugins/experimental/dscp_remap/Makefile.am
deleted file mode 100644
index eade7c4..0000000
--- a/plugins/experimental/dscp_remap/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = dscp_remap.la
-dscp_remap_la_SOURCES = dscp_remap.cc
-dscp_remap_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae4eb398/plugins/experimental/dscp_remap/dscp_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/dscp_remap/dscp_remap.cc b/plugins/experimental/dscp_remap/dscp_remap.cc
index 6d8337c..b26c24c 100644
--- a/plugins/experimental/dscp_remap/dscp_remap.cc
+++ b/plugins/experimental/dscp_remap/dscp_remap.cc
@@ -19,9 +19,6 @@
limitations under the License.
*/
-#include "ink_config.h"
-#include "ink_defs.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -58,7 +55,7 @@ TSRemapInit(TSRemapInterface* api_info, char *errbuf, int errbuf_size)
}
TSReturnCode
-TSRemapNewInstance(int argc ATS_UNUSED, char* argv[], void** ih, char* errbuf ATS_UNUSED, int errbuf_size ATS_UNUSED)
+TSRemapNewInstance(int argc, char* argv[], void** ih, char* errbuf, int errbuf_size)
{
int dscp;
DscpRemapInstance* di;
@@ -81,7 +78,7 @@ TSRemapDeleteInstance(void* ih)
}
TSRemapStatus
-TSRemapDoRemap(void* ih, TSHttpTxn txnp, TSRemapRequestInfo *rri ATS_UNUSED)
+TSRemapDoRemap(void* ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
{
int sockfd;
DscpRemapInstance* di = static_cast<DscpRemapInstance*>(ih);