trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r911702 [2/3] - in /incubator/trafficserver/traffic/branches/dev: ./ doc/ example/ example/add-header/ example/append-transform/ example/basic-auth/ example/blacklist-0/ example/blacklist-1/ example/bnull-transform/ example/cache_plugin/ ex...
Date Fri, 19 Feb 2010 05:37:33 GMT
Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc Fri Feb 19 05:37:28 2010
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "Regression.h"
-#include "api/include/InkAPIPrivate.h"
+#include "api/include/ts_private.h"
 #include "I_RecCore.h"
 
 #include "InkAPITestTool.cc"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPITestTool.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPITestTool.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPITestTool.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPITestTool.cc Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 #include "Regression.h"
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 
 #include <arpa/inet.h>          /* For htonl */
 #include "P_Net.h"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Makefile.am Fri Feb 19 05:37:28 2010
@@ -49,12 +49,17 @@
 
 noinst_PROGRAMS =  traffic_cust_log_fmt_cnvrt
 
+includedir=$(prefix)/include/ts
+
+include_HEADERS = \
+  api/include/ts.h \
+  api/include/remap.h \
+  api/include/ts_private.h \
+  api/include/ts_private_frozen.h
+
 noinst_HEADERS = \
-  api/include/InkAPIaaa.h \
-  api/include/InkAPI.h \
   api/include/InkAPIHughes.h \
-  api/include/InkAPIPrivateFrozen.h \
-  api/include/InkAPIPrivate.h \
+  api/include/InkAPIaaa.h \
   api/include/InkAPIPrivateIOCore.h \
   ConfigParse.h \
   NTDefs.h \
@@ -124,7 +129,6 @@
   Raf.h \
   RegressionSM.h \
   RegressionSM.cc \
-  RemapAPI.h \
   ReverseProxy.cc \
   ReverseProxy.h \
   RniTransStats.h \

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Plugin.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Plugin.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Plugin.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Plugin.h Fri Feb 19 05:37:28 2010
@@ -27,7 +27,7 @@
 #include "List.h"
 
 // need to keep syncronized with INKSDKVersion
-//   in InkAPI.h
+//   in ts/ts.h
 typedef enum
 {
   PLUGIN_SDK_VERSION_UNKNOWN = -1,

Modified: incubator/trafficserver/traffic/branches/dev/proxy/Prefetch.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/Prefetch.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/Prefetch.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/Prefetch.h Fri Feb 19 05:37:28 2010
@@ -30,7 +30,7 @@
 #ifdef PREFETCH
 
 #include "Update.h"
-#include "api/include/InkAPIPrivateFrozen.h"
+#include "api/include/ts_private_frozen.h"
 
 #define IPSTRARGS(ip) (unsigned int) ((unsigned char *) &(ip))[0],	\
 		      (unsigned int) ((unsigned char *) &(ip))[1],	\

Modified: incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/ReverseProxy.cc Fri Feb 19 05:37:28 2010
@@ -38,7 +38,7 @@
 #include "ReverseProxy.h"
 #include "MatcherUtils.h"
 #include "Tokenizer.h"
-#include "RemapAPI.h"
+#include "api/include/remap.h"
 #include "RemapPluginInfo.h"
 #include "RemapProcessor.h"
 #include "UrlRewrite.h"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/UDPAPIClientTest.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/UDPAPIClientTest.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/UDPAPIClientTest.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/UDPAPIClientTest.h Fri Feb 19 05:37:28 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "api/include/InkAPIPrivate.h"
+#include "api/include/ts_private.h"
 
 void UDPClientTestInit();
 int UDPClient_handle_callbacks(INKCont cont, INKEvent event, void *e);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/UDPAPITest.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/UDPAPITest.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/UDPAPITest.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/UDPAPITest.h Fri Feb 19 05:37:28 2010
@@ -21,8 +21,7 @@
   limitations under the License.
  */
 
-#include "api/include/InkAPIPrivate.h"
-//#include "InkAPIPrivate.h"
+#include "api/include/ts_private.h"
 
 void UDPTestInit();
 int handle_callbacks(INKCont cont, INKEvent event, void *e);

Modified: incubator/trafficserver/traffic/branches/dev/proxy/UserNameCacheTest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/UserNameCacheTest.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/UserNameCacheTest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/UserNameCacheTest.cc Fri Feb 19 05:37:28 2010
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 #include "UserNameCacheTest.h"
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateIOCore.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateIOCore.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateIOCore.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIPrivateIOCore.h Fri Feb 19 05:37:28 2010
@@ -23,7 +23,7 @@
 
 #ifndef __INK_API_PRIVATE_IOCORE_H__
 #define __INK_API_PRIVATE_IOCORE_H__
-#include "InkAPI.h"
+#include "ts.h"
 #if !defined(__GNUC__)
 #include "I_EventSystem.h"
 #include "I_Cache.h"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIaaa.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIaaa.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIaaa.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/api/include/InkAPIaaa.h Fri Feb 19 05:37:28 2010
@@ -26,7 +26,7 @@
 #define __INK_API_AAA_H_
 
 
-#include "InkAPI.h"
+#include "ts.h"
 
 
 #ifdef __cplusplus

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/config/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,3 @@
 Makefile.in
+Makefile
+records.config

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,2 @@
 Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/config/body_factory/default/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,3 @@
 Makefile.in
+Makefile
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/congest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libCongestionControl.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/dns_cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libdnscache.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,4 @@
 Makefile.in
+Makefile
+.deps
+libhdrs.a

Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HTTP.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HTTP.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HTTP.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/HTTP.h Fri Feb 19 05:37:28 2010
@@ -127,6 +127,10 @@
   SQUID_LOG_TCP_WEBFETCH_MISS = 'd',
   SQUID_LOG_TCP_SPIDER_BYPASS = 'e',
   SQUID_LOG_TCP_FUTURE_2 = 'f',
+  SQUID_LOG_TCP_HIT_REDIRECT = '[',       // standard redirect
+  SQUID_LOG_TCP_MISS_REDIRECT = ']',      // standard redirect
+  SQUID_LOG_TCP_HIT_X_REDIRECT = '<',     // extended redirect
+  SQUID_LOG_TCP_MISS_X_REDIRECT = '>',    // extended redirect
   SQUID_LOG_UDP_HIT = 'g',
   SQUID_LOG_UDP_WEAK_HIT = 'h',
   SQUID_LOG_UDP_HIT_OBJ = 'i',

Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.cc Fri Feb 19 05:37:28 2010
@@ -177,6 +177,7 @@
   obj_clear_data((HdrHeapObjImpl *) url);
   url->m_url_type = URL_TYPE_NONE;
   url->m_scheme_wks_idx = -1;
+  url->m_capacity_host = 0;
   url_clear_string_ref(url);
   return (url);
 }
@@ -313,7 +314,7 @@
   HDR_MOVE_STR(m_ptr_scheme, m_len_scheme);
   HDR_MOVE_STR(m_ptr_user, m_len_user);
   HDR_MOVE_STR(m_ptr_password, m_len_password);
-  HDR_MOVE_STR(m_ptr_host, m_len_host);
+  HDR_MOVE_STR(m_ptr_host, m_capacity_host);
   HDR_MOVE_STR(m_ptr_port, m_len_port);
   HDR_MOVE_STR(m_ptr_path, m_len_path);
   HDR_MOVE_STR(m_ptr_params, m_len_params);
@@ -328,7 +329,7 @@
   CHECK_STR(m_ptr_scheme, m_len_scheme, heaps, num_heaps);
   CHECK_STR(m_ptr_user, m_len_user, heaps, num_heaps);
   CHECK_STR(m_ptr_password, m_len_password, heaps, num_heaps);
-  CHECK_STR(m_ptr_host, m_len_host, heaps, num_heaps);
+  CHECK_STR(m_ptr_host, m_capacity_host, heaps, num_heaps);
   CHECK_STR(m_ptr_port, m_len_port, heaps, num_heaps);
   CHECK_STR(m_ptr_path, m_len_path, heaps, num_heaps);
   CHECK_STR(m_ptr_params, m_len_params, heaps, num_heaps);
@@ -410,9 +411,27 @@
 url_host_set(HdrHeap * heap, URLImpl * url, const char *value, int length, bool copy_string)
 {
   url_called_set(url);
-  if (length == 0)
-    value = NULL;
-  mime_str_u16_set(heap, value, length, &(url->m_ptr_host), &(url->m_len_host), copy_string);
+  if ((length <= 0) || (value == NULL)) {
+    url->m_len_host = 0;
+    return;
+  }
+
+  if (!copy_string) {
+    url->m_ptr_host = value;
+    url->m_len_host = length;
+    return;
+  }
+
+  if (url->m_capacity_host < length) {
+    if (url->m_capacity_host) {
+      heap->free_string(url->m_ptr_host, url->m_capacity_host);
+    }
+    url->m_ptr_host = heap->duplicate_str(value, length);
+    url->m_capacity_host = url->m_len_host = length;
+  } else {
+    memcpy(const_cast<char *>(url->m_ptr_host), value, length);
+    url->m_len_host = length;
+  }
 }
 
 /*-------------------------------------------------------------------------

Modified: incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/hdrs/URL.h Fri Feb 19 05:37:28 2010
@@ -50,6 +50,7 @@
   inku16 m_len_user;
   inku16 m_len_password;
   inku16 m_len_host;
+  inku16 m_capacity_host;
   inku16 m_len_port;
   inku16 m_len_path;
   inku16 m_len_params;

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/http2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libhttp.a
+.deps
+

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.cc Fri Feb 19 05:37:28 2010
@@ -971,6 +971,11 @@
                      RECD_FLOAT, RECP_NULL,
                      (int) http_ua_msecs_counts_other_unclassified_stat, RecRawStatSyncIntMsecsToFloatSeconds);
 
+  RecRegisterRawStat(http_rsb, RECT_PROCESS,
+                     "proxy.process.http.total_x_redirect_count",
+                     RECD_COUNTER, RECP_NULL,
+                     (int) http_total_x_redirect_stat, RecRawStatSyncCount);
+
 }
 
 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpConfig.h Fri Feb 19 05:37:28 2010
@@ -272,6 +272,8 @@
   http_ua_msecs_counts_errors_other_stat,
   http_ua_msecs_counts_other_unclassified_stat,
 
+  http_total_x_redirect_stat,
+
   // Times
   http_total_transactions_time_stat,
   http_total_transactions_think_time_stat,

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpDebugNames.h Fri Feb 19 05:37:28 2010
@@ -25,7 +25,7 @@
 #define _HttpDebugNames_h_
 
 #include "HttpTransact.h"
-#include "api/include/InkAPI.h"
+#include "api/include/ts.h"
 
 class HttpDebugNames
 {

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.cc Fri Feb 19 05:37:28 2010
@@ -325,7 +325,7 @@
 HttpSM::HttpSM():
 Continuation(NULL), sm_id(-1), magic(HTTP_SM_MAGIC_DEAD),
   //YTS Team, yamsat Plugin
-  enable_redirection(false), api_enable_redirection(true), redirection_tries(0), transfered_bytes(0),
+  enable_redirection(false), api_enable_redirection(true), redirect_url(NULL), redirect_url_len(0), redirection_tries(0), transfered_bytes(0),
 post_failed(false),
   //YTS Team, yamsat
   is_cache_enabled(false), request_inserted(false),
@@ -398,6 +398,8 @@
   sm_id = 0;
   enable_redirection = false;
   api_enable_redirection = true;
+  redirect_url = NULL;
+  redirect_url_len = 0;
 
   // Unique state machine identifier.
   //  changed next_sm_id from ink64 to int because
@@ -6865,6 +6867,12 @@
 
     HTTP_SM_SET_DEFAULT_HANDLER(NULL);
 
+    if (redirect_url != NULL) {
+      xfree(redirect_url);
+      redirect_url = NULL;
+      redirect_url_len = 0;
+    }
+
 #ifdef USE_HTTP_DEBUG_LISTS
     ink_mutex_acquire(&debug_sm_list_mutex);
     debug_sm_list.remove(this, this->debug_link);
@@ -7721,13 +7729,26 @@
   }
 
   HTTPStatus status = t_state.hdr_info.client_response.status_get();
-  if ((status == HTTP_STATUS_MOVED_TEMPORARILY) || (status == HTTP_STATUS_MOVED_PERMANENTLY)) {
+  // if redirect_url is set by an user's plugin, yts will redirect to this url anyway.
+  if ((redirect_url != NULL) || (status == HTTP_STATUS_MOVED_TEMPORARILY) || (status == HTTP_STATUS_MOVED_PERMANENTLY)) {
 
-    if (t_state.hdr_info.client_response.field_find(MIME_FIELD_LOCATION, MIME_LEN_LOCATION)) {
+    if (redirect_url != NULL || t_state.hdr_info.client_response.field_find(MIME_FIELD_LOCATION, MIME_LEN_LOCATION)) {
 
       if (Log::transaction_logging_enabled() && t_state.api_info.logging_enabled) {
         LogAccessHttp accessor(this);
-        //t_state.squid_codes.log_code = SQUID_LOG_TCP_HIT_REDIRECT;
+        if (redirect_url == NULL) {
+          if (t_state.squid_codes.log_code == SQUID_LOG_TCP_HIT)
+            t_state.squid_codes.log_code = SQUID_LOG_TCP_HIT_REDIRECT;
+          else
+            t_state.squid_codes.log_code = SQUID_LOG_TCP_MISS_REDIRECT;
+        }
+        else {
+          if (t_state.squid_codes.log_code == SQUID_LOG_TCP_HIT)
+            t_state.squid_codes.log_code = SQUID_LOG_TCP_HIT_X_REDIRECT;
+          else
+            t_state.squid_codes.log_code = SQUID_LOG_TCP_MISS_X_REDIRECT;
+        }
+
         int ret = Log::access(&accessor);
 
         if (ret & Log::FULL) {
@@ -7737,11 +7758,21 @@
           Log::error("failed to log transaction for at least one log object");
         }
       }
-      // get the location header and setup the redirect
-      int redirect_len;
-      char *redirect_url =
-        (char *) t_state.hdr_info.client_response.value_get(MIME_FIELD_LOCATION, MIME_LEN_LOCATION, &redirect_len);
-      redirect_request(redirect_url, redirect_len);
+
+      if (redirect_url != NULL) {
+        redirect_request(redirect_url, redirect_url_len);
+        xfree(redirect_url);
+        redirect_url = NULL;
+        redirect_url_len = 0;
+        HTTP_INCREMENT_DYN_STAT(http_total_x_redirect_stat);
+      }
+      else {
+        // get the location header and setup the redirect
+        int redir_len;
+        char *redir_url =
+        (char *) t_state.hdr_info.client_response.value_get(MIME_FIELD_LOCATION, MIME_LEN_LOCATION, &redir_len);
+        redirect_request(redir_url, redir_len);
+      }
 
     } else {
       enable_redirection = false;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpSM.h Fri Feb 19 05:37:28 2010
@@ -268,6 +268,8 @@
   //YTS Team, yamsat Plugin
   bool enable_redirection;      //To check if redirection is enabled
   bool api_enable_redirection;  //To check if redirection is enabled
+  char *redirect_url;           //url for force redirect (provide users a functionality to redirect to another url when needed)
+  int redirect_url_len;
   int redirection_tries;        //To monitor number of redirections
   int transfered_bytes;         //Added to calculate POST data
   bool post_failed;             //Added to identify post failure

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.cc Fri Feb 19 05:37:28 2010
@@ -1090,6 +1090,21 @@
   if ((hostname = url->host_get(&hostname_len)) == NULL)
     s->hdr_info.client_req_is_server_style = true;
 
+  s->orig_scheme = (scheme = url->scheme_get_wksidx());
+
+  s->method = s->hdr_info.client_request.method_get_wksidx();
+  if (scheme < 0 && s->method != HTTP_WKSIDX_CONNECT) {
+    if (s->client_info.port_attribute == SERVER_PORT_SSL) {
+      url->scheme_set(URL_SCHEME_HTTPS, URL_LEN_HTTPS);
+      s->orig_scheme = URL_WKSIDX_HTTPS;
+    } else {
+      url->scheme_set(URL_SCHEME_HTTP, URL_LEN_HTTP);
+      s->orig_scheme = URL_WKSIDX_HTTP;
+    }
+  }
+  if (s->method == HTTP_WKSIDX_CONNECT && url->port_get() == 0)
+    url->port_set(80);
+
   // If the incoming request is proxy-style AND contains a Host header,
   // then remove the Host header to prevent content spoofing.
 
@@ -1099,15 +1114,26 @@
     max_forwards = max_forwards_f->value_get_int();
   }
 
-  if ((max_forwards != 0) && !s->hdr_info.client_req_is_server_style) {
+  if ((max_forwards != 0) && !s->hdr_info.client_req_is_server_style && s->method != HTTP_WKSIDX_CONNECT) {
     MIMEField *host_field = s->hdr_info.client_request.field_find(MIME_FIELD_HOST, MIME_LEN_HOST);
-    int host_val_len;
-    const char *host_val;
+    int host_val_len = hostname_len;
+    const char **host_val = &hostname;
+    int req_host_val_len;
+    const char *req_host_val;
+    int port = url->port_get_raw();
+    char *buf = NULL;
+
+    if (port > 0) {
+      buf = (char *) xmalloc(host_val_len + 15);
+      strncpy(buf, hostname, host_val_len);
+      host_val_len += snprintf(buf + host_val_len, host_val_len + 15, ":%u", port);
+      host_val = (const char**)(&buf);
+    }
 
     if (!host_field ||
         (s->http_config_param->avoid_content_spoofing &&
-         ((host_val = host_field->value_get(&host_val_len)) == NULL ||
-          host_val_len != hostname_len || strncasecmp(hostname, host_val, hostname_len) != 0))) {
+         ((req_host_val = host_field->value_get(&req_host_val_len)) == NULL ||
+          host_val_len != req_host_val_len || strncasecmp(*host_val, req_host_val, host_val_len) != 0))) {
       // instead of deleting the Host: header, set it to URL host for all requests (including HTTP/1.0)
 
       if (!host_field) {
@@ -1115,8 +1141,11 @@
         s->hdr_info.client_request.field_attach(host_field);
       }
 
-      s->hdr_info.client_request.field_value_set(host_field, hostname, hostname_len);
+      s->hdr_info.client_request.field_value_set(host_field, *host_val, host_val_len);
     }
+
+    if (buf)
+      xfree(buf);
   }
 
   if (s->http_config_param->normalize_ae_gzip) {
@@ -1134,21 +1163,6 @@
     }
   }
 
-  s->orig_scheme = (scheme = url->scheme_get_wksidx());
-
-  s->method = s->hdr_info.client_request.method_get_wksidx();
-  if (scheme < 0 && s->method != HTTP_WKSIDX_CONNECT) {
-    if (s->client_info.port_attribute == SERVER_PORT_SSL) {
-      url->scheme_set(URL_SCHEME_HTTPS, URL_LEN_HTTPS);
-      s->orig_scheme = URL_WKSIDX_HTTPS;
-    } else {
-      url->scheme_set(URL_SCHEME_HTTP, URL_LEN_HTTP);
-      s->orig_scheme = URL_WKSIDX_HTTP;
-    }
-  }
-  if (s->method == HTTP_WKSIDX_CONNECT && url->port_get() == 0)
-    url->port_set(80);
-
   ////////////////////////////////////////////////////////
   // First check for the presence of a host header or   //
   // the availability of the host name through the url. //
@@ -1992,17 +2006,16 @@
                                                                     MIME_LEN_HOST, &host_len);
         if (host_hdr) {
           char *tmp;
+          int port = 0;
           tmp = (char *) memchr(host_hdr, ':', host_len);
           if (tmp) {
             s->cache_info.lookup_url->host_set(host_hdr, (tmp - host_hdr));
 
-            int port = ink_atoi(tmp + 1, host_len - (tmp + 1 - host_hdr));
-            if (port != 0) {
-              s->cache_info.lookup_url->port_set(port);
-            }
+            port = ink_atoi(tmp + 1, host_len - (tmp + 1 - host_hdr));
           } else {
             s->cache_info.lookup_url->host_set(host_hdr, host_len);
           }
+          s->cache_info.lookup_url->port_set(port);
         }
       }
       HTTP_DEBUG_ASSERT(s->cache_info.lookup_url->valid() == true);
@@ -5348,7 +5361,9 @@
       HTTP_DEBUG_ASSERT(s->cache_info.action == CACHE_DO_NO_ACTION);
       s->next_action = SERVER_READ;
     }
-    s->state_machine->enable_redirection = false;
+    if (s->state_machine->redirect_url == NULL) {
+      s->state_machine->enable_redirection = false;
+    }
     break;
   case HTTP_STATUS_NOT_MODIFIED:
     Debug("http_trans", "[hncoofsr] server sent back 304. IMS from client?");
@@ -8201,6 +8216,8 @@
         s->client_info.http_version == HTTPVersion(1, 1) &&
         ((s->http_config_param->chunking_enabled == 1 && s->remap_chunking_enabled != 0) ||
          (s->http_config_param->chunking_enabled == 0 && s->remap_chunking_enabled == 1)) &&
+        // if we're not sending a body, don't set a chunked header regardless of server response
+        !is_response_body_precluded(s->hdr_info.client_response.status_get(), s->method) &&
          // we do not need chunked encoding for internal error messages
          // that are sent to the client if the server response is not valid.
          ((s->source == SOURCE_HTTP_ORIGIN_SERVER &&

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTransact.h Fri Feb 19 05:37:28 2010
@@ -39,7 +39,7 @@
 #include "ProxyConfig.h"
 #include "Transform.h"
 //#include "HttpAuthParams.h"
-#include "RemapAPI.h"
+#include "api/include/remap.h"
 #include "RemapPluginInfo.h"
 
 
@@ -496,7 +496,7 @@
     TOTAL_RESPONSE_ERROR_TYPES
   };
 
-  // Please do not forget to fix INKServerState (InkAPI.h)
+  // Please do not forget to fix INKServerState (ts/ts.h)
   // in case of any modifications in ServerState_t
   enum ServerState_t
   {

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTunnel.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTunnel.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTunnel.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/HttpTunnel.cc Fri Feb 19 05:37:28 2010
@@ -760,12 +760,15 @@
   ink_assert(p->vc != NULL);
   active = true;
 
+  IOBufferReader *chunked_buffer_start = NULL, *dechunked_buffer_start = NULL;
   if (p->do_chunking || p->do_dechunking || p->do_chunked_passthru) {
     producer_n = (consumer_n = INT_MAX);
     p->chunked_handler.init(p->buffer_start, p);
 
     // Copy the header into the chunked/dechunked buffers.
     if (p->do_chunking) {
+      // initialize a reader to chunked buffer start before writing to keep ref count
+      chunked_buffer_start = p->chunked_handler.chunked_buffer->alloc_reader();
       p->chunked_handler.chunked_buffer->write(p->buffer_start, p->chunked_handler.skip_bytes);
     } else if (p->do_dechunking) {
       // bz57413
@@ -773,6 +776,9 @@
             "[producer_run] do_dechunking p->chunked_handler.chunked_reader->read_avail() = %d",
             p->chunked_handler.chunked_reader->read_avail());
 
+      // initialize a reader to dechunked buffer start before writing to keep ref count
+      dechunked_buffer_start = p->chunked_handler.dechunked_buffer->alloc_reader();
+
       // If there is no transformation then add the header to the buffer, else the
       // client already has got the header from us, no need for it in the buffer.
       if (!transform_consumer) {
@@ -805,7 +811,7 @@
         break;
       case TCA_DECHUNK_CONTENT:
       case TCA_PASSTHRU_CHUNKED_CONTENT:
-        c->buffer_reader = p->chunked_handler.dechunked_buffer->alloc_reader();
+        c->buffer_reader = p->chunked_handler.dechunked_buffer->clone_reader(dechunked_buffer_start);
         break;
       default:
         break;
@@ -813,9 +819,9 @@
     }
     // Non-cache consumers.
     else if (action == TCA_CHUNK_CONTENT) {
-      c->buffer_reader = p->chunked_handler.chunked_buffer->alloc_reader();
+      c->buffer_reader = p->chunked_handler.chunked_buffer->clone_reader(chunked_buffer_start);
     } else if (action == TCA_DECHUNK_CONTENT) {
-      c->buffer_reader = p->chunked_handler.dechunked_buffer->alloc_reader();
+      c->buffer_reader = p->chunked_handler.dechunked_buffer->clone_reader(dechunked_buffer_start);
     } else {
       c->buffer_reader = p->read_buffer->clone_reader(p->buffer_start);
     }
@@ -876,12 +882,19 @@
 
 
   if (p->do_chunking) {
+    // remove the chunked reader marker so that it doesn't act like a buffer guard
+    p->chunked_handler.chunked_buffer->dealloc_reader(chunked_buffer_start);
     p->chunked_handler.dechunked_reader->consume(p->chunked_handler.skip_bytes);
 
     // If there is data to process in the buffer, do it now
     if (p->chunked_handler.dechunked_reader->read_avail())
       producer_handler(VC_EVENT_READ_READY, p);
-  } else if (p->do_dechunking || p->do_chunked_passthru) {      // bz57413
+  } else if (p->do_dechunking || p->do_chunked_passthru) {      
+    // remove the dechunked reader marker so that it doesn't act like a buffer guard
+    if (p->do_dechunking)
+      p->chunked_handler.dechunked_buffer->dealloc_reader(dechunked_buffer_start);
+
+    // bz57413
     // If there is no transformation plugin, then we didn't add the header, hence no need to consume it
     Debug("http_tunnel",
           "[producer_run] do_dechunking p->chunked_handler.chunked_reader->read_avail() = %d",

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPluginInfo.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPluginInfo.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPluginInfo.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPluginInfo.h Fri Feb 19 05:37:28 2010
@@ -24,7 +24,7 @@
 #if !defined (_REMAPPLUGININFO_h_)
 #define _REMAPPLUGININFO_h_
 #include "inktomi++.h"
-#include "RemapAPI.h"
+#include "api/include/remap.h"
 
 // Remap inline options
 #define REMAP_OPTFLG_MAP_WITH_REFERER 0x01      /* "map_with_referer" option */

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.cc Fri Feb 19 05:37:28 2010
@@ -410,7 +410,7 @@
     _request_url->host_set(toHost, toHostLen);
   }
 
-  if (!plugin_modified_port && (requestPort != map_to->port_get()))
+  if (!plugin_modified_port)
     _request_url->port_set(map_to->port_get_raw());
 
   // Extra byte is potentially needed for prefix path '/'.

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapPlugins.h Fri Feb 19 05:37:28 2010
@@ -31,7 +31,7 @@
 #include "inktomi++.h"
 #include "I_EventSystem.h"
 #include "RemapProcessor.h"
-#include "RemapAPI.h"
+#include "api/include/remap.h"
 #include "RemapPluginInfo.h"
 #include "HttpTransact.h"
 #include "ReverseProxy.h"

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc Fri Feb 19 05:37:28 2010
@@ -31,7 +31,7 @@
 #include "ReverseProxy.h"
 #include "MatcherUtils.h"
 #include "Tokenizer.h"
-#include "RemapAPI.h"
+#include "api/include/remap.h"
 #include "UrlMappingPathIndex.h"
 
 #include "ink_string.h"
@@ -734,38 +734,13 @@
 */
 url_mapping *
 UrlRewrite::_tableLookup(InkHashTable * h_table, URL * request_url,
-                        int request_port, const char *request_host, int request_host_len, char *tag)
+                        int request_port, char *request_host, int request_host_len, char *tag)
 {
   UrlMappingPathIndex *ht_entry;
   url_mapping *um = NULL;
-  char host_lower_buf[1024], *request_host_lower, *xfree_buf_ptr;
-  int ht_result, tmp;
+  int ht_result;
 
-  if (unlikely(!request_host || !request_url || request_host_len < 0))
-    return NULL;
-
-  // Canonicalize the string to lower case so that lookup
-  //   is case insensitive
-  if (unlikely((request_host_len + 1) > (int) sizeof(host_lower_buf))) {
-    if (unlikely((request_host_lower = (xfree_buf_ptr = ((char *) xmalloc(request_host_len + 1)))) == NULL))
-      return NULL;              // impossible
-  } else {
-    request_host_lower = &host_lower_buf[0];
-    xfree_buf_ptr = 0;          /* try to minimize memory allocation */
-  }
-
-  // Copy and tolower    
-  for (tmp = 0; tmp < request_host_len; tmp++) {
-    if ((ht_result = (request_host_lower[tmp] = request_host[tmp])) >= 'A' && ht_result <= 'Z') {
-      request_host_lower[tmp] = (ht_result + ('a' - 'A'));
-    }
-  }
-  request_host_lower[request_host_len] = 0;
-
-  ht_result = ink_hash_table_lookup(h_table, request_host_lower, (void **) &ht_entry);
-
-  if (unlikely(xfree_buf_ptr))
-    xfree(xfree_buf_ptr);
+  ht_result = ink_hash_table_lookup(h_table, request_host, (void **) &ht_entry);
 
   if (likely(ht_result && ht_entry)) {
     um = ht_entry->Search(request_url, request_port);
@@ -846,10 +821,8 @@
   if (!plugin_modified_host)
     request_url->host_set(toHost, toHostLen);
 
-  if (!plugin_modified_port && 
-      ((requestPort != map_to->port_get()) || map_to->port_get_raw())) {
+  if (!plugin_modified_port)
     request_url->port_set(map_to->port_get_raw());
-  }
 
   // Extra byte is potentially needed for prefix path '/'.
   // Added an extra 3 so that TS wouldn't crash in the field.
@@ -1484,13 +1457,21 @@
   return length;
 }
 
-inline void
+inline bool
 UrlRewrite::_addToStore(MappingsStore &store, url_mapping *new_mapping, RegexMapping &reg_map,
                         char *src_host, bool is_cur_mapping_regex, int &count)
 {
-  is_cur_mapping_regex ? store.regex_list.push_back(reg_map) : 
-    TableInsert(store.hash_lookup, new_mapping, src_host);
-  ++count;
+  bool retval;
+  if (is_cur_mapping_regex) {
+    store.regex_list.push_back(reg_map);
+    retval = true;
+  } else {
+    retval = TableInsert(store.hash_lookup, new_mapping, src_host);
+  }
+  if (retval) {
+    ++count;
+  }
+  return retval;
 }
 
 /**
@@ -1534,6 +1515,7 @@
   RegexMapping reg_map;
   bool is_cur_mapping_regex;
   const char *type_id_str;
+  bool add_result;
   
   ink_assert(forward_mappings.empty());
   ink_assert(reverse_mappings.empty());
@@ -1844,35 +1826,41 @@
     fromHost_lower[fromHostLen] = 0;
     LowerCaseStr(fromHost_lower);
 
+    // set the normalized string so nobody else has to normalize this
+    new_mapping->fromURL.host_set(fromHost_lower, fromHostLen);
+
     if (is_cur_mapping_regex) {
       // it's ok to reuse reg_map as previous content (if any)
       // would be "reference-copied" into regex mapping lists
-      if (!_processRegexMappingConfig(new_mapping, reg_map)) {
+      if (!_processRegexMappingConfig(fromHost_lower, new_mapping, reg_map)) {
         errStr = "Could not process regex mapping config line";
         goto MAP_ERROR;
       }
       Debug("url_rewrite_regex", "Configured regex rule for host [%s]", fromHost_lower);
     }
 
+    add_result = false;
+
     switch (maptype) {
     case FORWARD_MAP:
     case FORWARD_MAP_REFERER:
-      _addToStore(forward_mappings, new_mapping, reg_map, fromHost_lower, 
-                  is_cur_mapping_regex, num_rules_forward);
-      SetHomePageRedirectFlag(new_mapping);   // @todo: is this applicable to regex mapping too?
+      if ((add_result = _addToStore(forward_mappings, new_mapping, reg_map, fromHost_lower, 
+                                    is_cur_mapping_regex, num_rules_forward)) == true) {
+        SetHomePageRedirectFlag(new_mapping);   // @todo: is this applicable to regex mapping too?
+      }
       break;
     case REVERSE_MAP:
-      _addToStore(reverse_mappings, new_mapping, reg_map, fromHost_lower, 
-                  is_cur_mapping_regex, num_rules_reverse);
+      add_result = _addToStore(reverse_mappings, new_mapping, reg_map, fromHost_lower, 
+                               is_cur_mapping_regex, num_rules_reverse);
       new_mapping->homePageRedirect = false;
       break;
     case PERMANENT_REDIRECT:
-      _addToStore(permanent_redirects, new_mapping, reg_map, fromHost_lower, 
-                  is_cur_mapping_regex, num_rules_redirect_permanent);
+      add_result = _addToStore(permanent_redirects, new_mapping, reg_map, fromHost_lower, 
+                               is_cur_mapping_regex, num_rules_redirect_permanent);
       break;
     case TEMPORARY_REDIRECT:
-      _addToStore(temporary_redirects, new_mapping, reg_map, fromHost_lower, 
-                  is_cur_mapping_regex, num_rules_redirect_temporary);
+      add_result = _addToStore(temporary_redirects, new_mapping, reg_map, fromHost_lower, 
+                               is_cur_mapping_regex, num_rules_redirect_temporary);
       break;
     default:
       // 'default' required to avoid compiler warning; unsupported map
@@ -1880,6 +1868,10 @@
       break;
     };
 
+    if (!add_result) {
+      goto MAP_WARNING;
+    }
+
     // If a TS receives a request on a port which is set to tunnel mode
     // (ie, blind forwarding) and a client connects directly to the TS,
     // then the TS will use its IPv4 address and remap rules given
@@ -1913,7 +1905,9 @@
             u_mapping->toURL.copy(&new_mapping->toURL);
             if (bti.paramv[3] != NULL)
               u_mapping->tag = xstrdup(&(bti.paramv[3][0]));
-            TableInsert(forward_mappings.hash_lookup, u_mapping, ipv4_name);
+            if (!TableInsert(forward_mappings.hash_lookup, u_mapping, ipv4_name)) {
+              goto MAP_WARNING;
+            }
             num_rules_forward++;
             SetHomePageRedirectFlag(u_mapping);
           }
@@ -1953,7 +1947,9 @@
             u_mapping->toURL.copy(&new_mapping->toURL);
             if (bti.paramv[3] != NULL)
               u_mapping->tag = xstrdup(&(bti.paramv[3][0]));
-            TableInsert(forward_mappings.hash_lookup, u_mapping, ipv4_name);
+            if (!TableInsert(forward_mappings.hash_lookup, u_mapping, ipv4_name)) {
+              goto MAP_WARNING;
+            }
             num_rules_forward++;
             SetHomePageRedirectFlag(u_mapping);
           }
@@ -1986,7 +1982,9 @@
             u_mapping->toURL.host_set(ipv4_name, strlen(ipv4_name));
             if (bti.paramv[3] != NULL)
               u_mapping->tag = xstrdup(&(bti.paramv[3][0]));
-            TableInsert(reverse_mappings.hash_lookup, u_mapping, fromHost_lower);
+            if (!TableInsert(reverse_mappings.hash_lookup, u_mapping, fromHost_lower)) {
+              goto MAP_WARNING;
+            }
             num_rules_reverse++;
             u_mapping->homePageRedirect = false;
           }
@@ -2040,6 +2038,14 @@
     cln++;
     continue;
 
+  MAP_WARNING:
+    Error("Could not add rule at line #%d; Continuing with remaining lines", cln + 1);
+    if (new_mapping) {
+      delete new_mapping;
+      new_mapping = NULL;
+    }
+    continue;
+
   MAP_ERROR:
     ink_snprintf(errBuf, sizeof(errBuf), "%s %s at line %d", modulePrefix, errStr, cln + 1);
     SignalError(errBuf, alarm_already);
@@ -2061,15 +2067,23 @@
   // since this is more specific
   if (unlikely(backdoor_enabled)) {
     new_mapping = SetupBackdoorMapping();
-    TableInsert(forward_mappings.hash_lookup, new_mapping, "");
-    num_rules_forward++;
+    if (TableInsert(forward_mappings.hash_lookup, new_mapping, "")) {
+      num_rules_forward++;
+    } else {
+      Error("Could not insert backdoor mapping into store");
+      delete new_mapping;
+    }
   }
   // Add the default mapping to the manager PAC file
   //  if we need it
   if (default_to_pac) {
     new_mapping = SetupPacMapping();
-    TableInsert(forward_mappings.hash_lookup, new_mapping, "");
-    num_rules_forward++;
+    if (TableInsert(forward_mappings.hash_lookup, new_mapping, "")) {
+      num_rules_forward++;
+    } else {
+      Error("Could not insert pac mapping into store");
+      delete new_mapping;
+    }
   }
   // Destroy unused tables
   if (num_rules_forward == 0) {
@@ -2102,7 +2116,7 @@
   of existing entries bound to src_host if necessary.
 
 */
-void
+bool
 UrlRewrite::TableInsert(InkHashTable * h_table, url_mapping * mapping, char *src_host)
 {
   char src_host_tmp_buf[1];
@@ -2118,7 +2132,7 @@
     if (ht_contents == NULL) {
       // why should this happen?
       Error("Found entry cannot be null!");
-      return;
+      return false;
     }
   } else {
     ht_contents = new UrlMappingPathIndex();
@@ -2126,12 +2140,13 @@
   }
   if (!ht_contents->Insert(mapping)) {
     Error("Could not insert new mapping");
-    // @todo - should we delete these now?
+    return false;
   }
+  return true;
 }
 
 url_mapping_ext *
-UrlRewrite::forwardTableLookupExt(URL * request_url, int request_port, const char *request_host, int host_len,
+UrlRewrite::forwardTableLookupExt(URL * request_url, int request_port, char *request_host, int host_len,
                                   char *tag)
 {
   if (forward_mappings.hash_lookup) {
@@ -2145,7 +2160,7 @@
 
 
 url_mapping_ext *
-UrlRewrite::reverseTableLookupExt(URL * request_url, int request_port, const char *request_host, int host_len,
+UrlRewrite::reverseTableLookupExt(URL * request_url, int request_port, char *request_host, int host_len,
                                   char *tag)
 {
   if (reverse_mappings.hash_lookup) {
@@ -2370,15 +2385,29 @@
 UrlRewrite::_mappingLookup(MappingsStore &mappings, URL *request_url,
                            int request_port, const char *request_host, int request_host_len, char *tag)
 {
+  char request_host_lower[TSREMAP_RRI_MAX_HOST_SIZE];
+
+  if (!request_host || !request_url ||
+      (request_host_len < 0) || (request_host_len >= TSREMAP_RRI_MAX_HOST_SIZE)) {
+    Error("url_rewrite: Invalid arguments!");
+    return NULL;
+  }
+
+  // lowercase
+  for (int i = 0; i < request_host_len; ++i) {
+    request_host_lower[i] = tolower(request_host[i]);
+  }
+  request_host_lower[request_host_len] = 0;
+
   int rank_ceiling = -1;
-  url_mapping *mapping = _tableLookup(mappings.hash_lookup, request_url, request_port, request_host, 
+  url_mapping *mapping = _tableLookup(mappings.hash_lookup, request_url, request_port, request_host_lower, 
                                       request_host_len, tag);
   if (mapping != NULL) {
     rank_ceiling = mapping->getRank();
     Debug("url_rewrite_regex", "Found 'simple' mapping with rank %d", rank_ceiling);
   }
   url_mapping *regex_mapping = _regexMappingLookup(mappings.regex_list, request_url, request_port, 
-                                                   request_host, request_host_len, tag, rank_ceiling);
+                                                   request_host_lower, request_host_len, tag, rank_ceiling);
   if (regex_mapping) {
     mapping = regex_mapping;
     Debug("url_rewrite_regex", "Using regex mapping with rank %d", mapping->getRank());
@@ -2542,25 +2571,16 @@
     inconsequential and will be perfunctorily null-ed;
 */
 bool
-UrlRewrite::_processRegexMappingConfig(url_mapping *new_mapping, RegexMapping &reg_map)
+UrlRewrite::_processRegexMappingConfig(const char *from_host_lower, url_mapping *new_mapping,
+                                       RegexMapping &reg_map)
 {
-  char *regex_str;
   const char *str;
   int str_index;
-  const char *from_host;
-  int from_host_len;
   const char *to_host;
   int to_host_len;
   int substitution_id;
   int substitution_count = 0;
 
-  // we get a NULL-terminated version because that is what 
-  // pcre_compile needs
-  from_host = new_mapping->fromURL.host_get(&from_host_len);
-  regex_str = static_cast<char *>(ink_malloc(from_host_len + 1));
-  memcpy(regex_str, from_host, from_host_len);
-  regex_str[from_host_len] = '\0';
-  
   reg_map.re = NULL;
   reg_map.re_extra = NULL;
   reg_map.to_url_host_template = NULL;
@@ -2569,9 +2589,11 @@
   
   reg_map.url_map = new_mapping;
 
-  reg_map.re = pcre_compile(regex_str, 0, &str, &str_index, NULL);
+  // using from_host_lower (and not new_mapping->fromURL.host_get())
+  // as this one will be NULL-terminated (required by pcre_compile)
+  reg_map.re = pcre_compile(from_host_lower, 0, &str, &str_index, NULL);
   if (reg_map.re == NULL) {
-    Error("pcre_compile failed! Regex has error starting at %s", regex_str + str_index);
+    Error("pcre_compile failed! Regex has error starting at %s", from_host_lower + str_index);
     goto lFail;
   }
   
@@ -2597,13 +2619,13 @@
     if (to_host[i] == '$') {
       if (substitution_count > MAX_REGEX_SUBS) {
         Error("Cannot have more than %d substitutions in mapping with host [%s]",
-              MAX_REGEX_SUBS, regex_str);
+              MAX_REGEX_SUBS, from_host_lower);
         goto lFail;
       }
       substitution_id = to_host[i + 1] - '0';
       if ((substitution_id < 0) || (substitution_id > n_captures)) {
         Error("Substitution id [%c] has no corresponding capture pattern in regex [%s]",
-              to_host[i + 1], regex_str);
+              to_host[i + 1], from_host_lower);
         goto lFail;
       }
       reg_map.substitution_markers[reg_map.n_substitutions] = i;
@@ -2621,7 +2643,6 @@
   reg_map.to_url_host_template = static_cast<char *>(ink_malloc(str_index));
   memcpy(reg_map.to_url_host_template, str, str_index);
 
-  ink_free(regex_str);
   return true;
   
  lFail:
@@ -2638,6 +2659,5 @@
     reg_map.to_url_host_template = NULL;
     reg_map.to_url_host_template_len = 0;
   }
-  ink_free(regex_str);
   return false;
 }

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.h (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.h Fri Feb 19 05:37:28 2010
@@ -90,9 +90,9 @@
   void SetPristineFlag(int flag);
   void Print();
   url_mapping_ext *forwardTableLookupExt(URL * request_url,
-                                         int request_port, const char *request_host, int host_len, char *tag = 0);
+                                         int request_port, char *request_host, int host_len, char *tag = 0);
   url_mapping_ext *reverseTableLookupExt(URL * request_url,
-                                         int request_port, const char *request_host, int host_len, char *tag = 0);
+                                         int request_port, char *request_host, int host_len, char *tag = 0);
 //  private:
 
   static const int MAX_REGEX_SUBS = 10;
@@ -140,7 +140,7 @@
     _destroyTable(store.hash_lookup);
     _destroyList(store.regex_list);
   }
-  void TableInsert(InkHashTable * h_table, url_mapping * mapping, char *src_host);
+  bool TableInsert(InkHashTable * h_table, url_mapping * mapping, char *src_host);
 
   MappingsStore forward_mappings;
   MappingsStore reverse_mappings;
@@ -201,16 +201,16 @@
   url_mapping *_mappingLookup(MappingsStore &mappings, URL *request_url,
                               int request_port, const char *request_host, int request_host_len, char *tag);
   url_mapping *_tableLookup(InkHashTable * h_table, URL * request_url,
-                            int request_port, const char *request_host, int request_host_len, char *tag);
+                            int request_port, char *request_host, int request_host_len, char *tag);
   url_mapping *_regexMappingLookup(RegexMappingList &regex_mappings,
                                    URL * request_url, int request_port, const char *request_host, 
                                    int request_host_len, char *tag, int rank_ceiling);
   int _expandSubstitutions(int *matches_info, const RegexMapping &reg_map,
                            const char *matched_string, char *dest_buf, int dest_buf_size);
-  bool _processRegexMappingConfig(url_mapping *new_mapping, RegexMapping &reg_map);
+  bool _processRegexMappingConfig(const char *from_host_lower, url_mapping *new_mapping, RegexMapping &reg_map);
   void _destroyTable(InkHashTable *h_table);
   void _destroyList(RegexMappingList &regexes);
-  inline void _addToStore(MappingsStore &store, url_mapping *new_mapping, RegexMapping &reg_map,
+  inline bool _addToStore(MappingsStore &store, url_mapping *new_mapping, RegexMapping &reg_map,
                           char *src_host, bool is_cur_mapping_regex, int &count);
 
   static const int MAX_URL_STR_SIZE = 1024;

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/logging/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+liblogging.a
+.deps
+

Modified: incubator/trafficserver/traffic/branches/dev/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/logging/Log.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/logging/Log.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/logging/Log.cc Fri Feb 19 05:37:28 2010
@@ -573,6 +573,10 @@
          SQUID_LOG_TCP_WEBFETCH_MISS, "TCP_WEBFETCH_MISS",
          SQUID_LOG_TCP_SPIDER_BYPASS, "TCP_SPIDER_BYPASS",
          SQUID_LOG_TCP_FUTURE_2, "TCP_FUTURE_2",
+         SQUID_LOG_TCP_HIT_REDIRECT, "TCP_HIT_REDIRECT",
+         SQUID_LOG_TCP_MISS_REDIRECT, "TCP_MISS_REDIRECT",
+         SQUID_LOG_TCP_HIT_X_REDIRECT, "TCP_HIT_X_REDIRECT",
+         SQUID_LOG_TCP_MISS_X_REDIRECT, "TCP_MISS_X_REDIRECT",
          SQUID_LOG_UDP_HIT, "UDP_HIT",
          SQUID_LOG_UDP_WEAK_HIT, "UDP_WEAK_HIT",
          SQUID_LOG_UDP_HIT_OBJ, "UDP_HIT_OBJ",

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,8 @@
 Makefile.in
+Makefile
+traffic_manager
+libmgmt_p.a
+librecords.a
+.deps
+.libs
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,4 @@
 Makefile.in
+Makefile
+.deps
+libmgmtapilocal.a

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/api2/remote/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,7 @@
 Makefile.in
+Makefile
+libmgmtapiremote.a
+traffic_api_cli_remote
+.libs
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,7 @@
 Makefile.in
+libcli_lm.a
+libcli_tl.a
+Makefile
+traffic_line
+.libs
+.deps

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cli2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,7 @@
 Makefile.in
+Makefile
+traffic_shell
+libtrafficshell.a
+.deps
+.libs
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cluster/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libcluster.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/cop/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,6 @@
 Makefile.in
+Makefile
+traffic_cop
+.libs
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,2 @@
 Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/agent-installer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/charting/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/configure/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/configure/helper/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/images/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/include/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/monitor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/mrtg/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/html2/tune/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+navigation_tree.xml

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/preparse/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libpreparse.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/stats/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libstats.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,12 @@
 Makefile.in
+Makefile
+libinksysapi.a
+traffic_vip_config
+traffic_time_config
+traffic_mcast_snoop
+libinkconfigapi.a
+traffic_net_config
+traffic_shmem_clean
+.libs
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libutils_p.a
+libutils_lm.a
+.deps

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,5 @@
 Makefile.in
+Makefile
+libweb.a
+.deps
+

Propchange: incubator/trafficserver/traffic/branches/dev/proxy/stats/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 19 05:37:28 2010
@@ -1 +1,4 @@
 Makefile.in
+Makefile
+.deps
+libstats.a

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/CacheAPITester.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/CacheAPITester.h?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/CacheAPITester.h (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/CacheAPITester.h Fri Feb 19 05:37:28 2010
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <limits.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 #define DEBUG_TAG "CacheAPITester-dbg"
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/CacheAPITester/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,17 +18,17 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: CacheAPITester.so CacheAPITester-dbg.so
 
-CacheAPITester.o: CacheAPITester.c CacheAPITester.h $(API_INC)/InkAPI.h
+CacheAPITester.o: CacheAPITester.c CacheAPITester.h $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o CacheAPITester.o -c CacheAPITester.c
 
 CacheAPITester.so: CacheAPITester.o
 	$(CC) $(LDFLAGS) -o CacheAPITester.so CacheAPITester.o
 
-CacheAPITester-dbg.o: CacheAPITester.c CacheAPITester.h $(API_INC)/InkAPI.h
+CacheAPITester-dbg.o: CacheAPITester.c CacheAPITester.h $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -DDEBUG -I$(API_INC) -o CacheAPITester-dbg.o -c CacheAPITester.c
 
 CacheAPITester-dbg.so: CacheAPITester-dbg.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/INKAction.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/INKAction.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/INKAction.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/INKAction.cc Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include "ink_assert.h"
 #include <arpa/inet.h>
 #include <netdb.h>

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKAction/Makefile.am Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 LIBINK_INC=../../../../../ts-libinktomi
 
 default: INKAction.so
@@ -30,7 +30,7 @@
 INKAction.so: INKAction.o
 	$(CPLUSPLUS) $(LDFLAGS) -g -o INKAction.so INKAction.o
 
-INKAction.o: INKAction.cc $(API_INC)/InkAPI.h $(LIBINK_INC)/ink_assert.h
+INKAction.o: INKAction.cc $(API_INC)/ts.h $(LIBINK_INC)/ink_assert.h
 	$(CPLUSPLUS) $(CFLAGS) -g -I$(API_INC) -o INKAction.o \
 		-I$(LIBINK_INC) -c INKAction.cc
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKContLeak/wapnet.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKContLeak/wapnet.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKContLeak/wapnet.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKContLeak/wapnet.c Fri Feb 19 05:37:28 2010
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/INKContSchedule.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/INKContSchedule.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/INKContSchedule.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/INKContSchedule.c Fri Feb 19 05:37:28 2010
@@ -47,7 +47,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include <InkAPI.h>
+#include <ts/ts.h>
 
 /* Verification code for: INKqa06643 */
 static int

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: INKContSchedule.so
 
-INKContSchedule.o: INKContSchedule.c $(API_INC)/InkAPI.h
+INKContSchedule.o: INKContSchedule.c $(API_INC)/ts.h
 	$(CC) -g $(CFLAGS) -I$(API_INC) -o INKContSchedule.o \
 		-c INKContSchedule.c
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/mod.Sched
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/mod.Sched?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/mod.Sched (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKContinuations/mod.Sched Fri Feb 19 05:37:28 2010
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include <InkAPI.h> 
+#include <ts/ts.h> 
 
 /* Verification code for: INKqa06643 */
 static int

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/INKFopen.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/INKFopen.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/INKFopen.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/INKFopen.c Fri Feb 19 05:37:28 2010
@@ -65,7 +65,7 @@
 
 *****************************************************************************/
 
-#include "InkAPI.h"
+#include "ts.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKFopen/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: INKFopen.so
 
-INKFopen.o: INKFopen.c $(API_INC)/InkAPI.h
+INKFopen.o: INKFopen.c $(API_INC)/ts.h
 	$(CC) -g $(CFLAGS) -I$(API_INC) -o INKFopen.o -c INKFopen.c
 
 INKFopen.so: INKFopen.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpHook.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpHook.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpHook.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpHook.c Fri Feb 19 05:37:28 2010
@@ -30,7 +30,7 @@
 */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include <sys/types.h>
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c Fri Feb 19 05:37:28 2010
@@ -26,7 +26,7 @@
 TODO tests of stoping an event at the session and transaction level
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include <sys/types.h>
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c Fri Feb 19 05:37:28 2010
@@ -34,7 +34,7 @@
 
 */
 
-#include "InkAPI.h"
+#include "ts.h"
 #include <sys/types.h>
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c Fri Feb 19 05:37:28 2010
@@ -28,7 +28,7 @@
 */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include <sys/types.h>
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 
 #if 0
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 
 /* This is a response to a client (req), which will be executed after reciept
  * of: 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c Fri Feb 19 05:37:28 2010
@@ -32,7 +32,7 @@
 */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include <sys/types.h>
 #include <stdio.h>
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 #include "ink_assert.h"
 #include <netdb.h>
 #include <netinet/in.h>

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 
 #if 0
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKProto.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKProto.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKProto.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/INKProto.c Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
  */
 
 
-#include "InkAPI.h"
+#include "ts.h"
 
 #if 0
 /* HTTP transactions */

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKHttpHooksTrans/Makefile.am Fri Feb 19 05:37:28 2010
@@ -22,7 +22,7 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 LIBINK_INC=../../../../../ts-libinktomi
 
 default: INKHttpHook.so INKHttpSsnHookAdd.so INKHttpSelAlt.so \
@@ -30,13 +30,13 @@
 
 
 ########## INKHttpHook.so 
-INKHttpHook.o: INKHttpHook.c $(API_INC)/InkAPI.h
+INKHttpHook.o: INKHttpHook.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -g -I$(API_INC) -o INKHttpHook.o -c INKHttpHook.c
 INKHttpHook.so: INKHttpHook.o
 	$(CC) $(LDFLAGS) -g -o INKHttpHook.so INKHttpHook.o
 
 ########## INKHttpSsnHookAdd.so 
-INKHttpSsnHookAdd.o: INKHttpSsnHookAdd.c $(API_INC)/InkAPI.h
+INKHttpSsnHookAdd.o: INKHttpSsnHookAdd.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -g -I$(API_INC) -o INKHttpSsnHookAdd.o -c \
 		INKHttpSsnHookAdd.c
 INKHttpSsnHookAdd.so: INKHttpSsnHookAdd.o
@@ -44,24 +44,24 @@
 
 INKHttpSelAlt.so: INKHttpSelAlt.o 
 	$(CC) $(LDFLAGS) -g -o INKHttpSelAlt.so INKHttpSelAlt.o
-INKHttpSelAlt.o: INKHttpSelAlt.c $(API_INC)/InkAPI.h
+INKHttpSelAlt.o: INKHttpSelAlt.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -g -I$(API_INC) -o INKHttpSelAlt.o -c INKHttpSelAlt.c
 
 INKHttpTransaction.so: INKHttpTransaction.o 
 	$(CC) $(LDFLAGS) -g -o INKHttpTransaction.so INKHttpTransaction.o
-INKHttpTransaction.o: INKHttpTransaction.c $(API_INC)/InkAPI.h
+INKHttpTransaction.o: INKHttpTransaction.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -g -I$(API_INC) -o INKHttpTransaction.o -c INKHttpTransaction.c
 
 INKHttpTxnErrBodySet.so: INKHttpTxnErrBodySet.o
 	$(CC) $(LDFLAGS) -g -o INKHttpTxnErrBodySet.so INKHttpTxnErrBodySet.o
 	
-INKHttpTxnErrBodySet.o: INKHttpTxnErrBodySet.c $(API_INC)/InkAPI.h
+INKHttpTxnErrBodySet.o: INKHttpTxnErrBodySet.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -g -I$(API_INC) -o INKHttpTxnErrBodySet.o \
 		-c INKHttpTxnErrBodySet.c
 
 INKHttpTxnIPAddress.so: INKHttpTxnIPAddress.o
 	$(CPLUSPLUS) $(LDFLAGS) -g -o INKHttpTxnIPAddress.so INKHttpTxnIPAddress.o
-INKHttpTxnIPAddress.o: INKHttpTxnIPAddress.cc $(API_INC)/InkAPI.h \
+INKHttpTxnIPAddress.o: INKHttpTxnIPAddress.cc $(API_INC)/ts.h \
 			$(LIBINK_INC)/ink_assert.h
 	$(CPLUSPLUS) $(CFLAGS) -g -I$(API_INC) -o INKHttpTxnIPAddress.o \
 		-I$(LIBINK_INC) -c INKHttpTxnIPAddress.cc

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKNetConnectTest.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKNetConnectTest.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKNetConnectTest.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKNetConnectTest.c Fri Feb 19 05:37:28 2010
@@ -1,29 +1,29 @@
 /** @file
 
-  A brief file description
+  a brief file description
 
-  @section license License
+  @section license license
 
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
+  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.
+  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 <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 static const char *g_strPluginName = "INKNetConnectTest plugin";
 static unsigned int g_ConnectionAddress;

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKqa8418.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKqa8418.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKqa8418.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/INKqa8418.c Fri Feb 19 05:37:28 2010
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <netinet/in.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 typedef struct
 {

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/INKNetConnect/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,17 +18,17 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: INKNetConnectTest.so INKqa8418.so
 
-INKNetConnectTest.o: INKNetConnectTest.c $(API_INC)/InkAPI.h
+INKNetConnectTest.o: INKNetConnectTest.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o INKNetConnectTest.o -c INKNetConnectTest.c
 
 INKNetConnectTest.so: INKNetConnectTest.o
 	$(CC) $(LDFLAGS) -o INKNetConnectTest.so INKNetConnectTest.o
 
-INKqa8418.o: INKqa8418.c $(API_INC)/InkAPI.h
+INKqa8418.o: INKqa8418.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o INKqa8418.o -c INKqa8418.c
 
 INKqa8418.so: INKqa8418.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/Makefile.am Fri Feb 19 05:37:28 2010
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-API_HDR = ../include/InkAPI.h
+API_HDR = ../../../proxy/api/include/ts.h
 AM_CFLAGS = -g -Wall -fPIC
 AM_LDFLAGS = -g -Wall -shared
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: add-header-deprecated.so
 
-add-header-deprecated.o: add-header.deprecated.c $(API_INC)/InkAPI.h
+add-header-deprecated.o: add-header.deprecated.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o add-header-deprecated.o -c add-header.deprecated.c
 
 add-header-deprecated.so: add-header-deprecated.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/add-header.deprecated.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/add-header.deprecated.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/add-header.deprecated.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/add-header-deprecated/add-header.deprecated.c Fri Feb 19 05:37:28 2010
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 static INKMBuffer hdr_bufp;
 static INKMLoc hdr_loc;

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,17 +18,17 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: alt-info.so alt-info-dbg.so
 
-alt-info.o: alt-info.c $(API_INC)/InkAPI.h
+alt-info.o: alt-info.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o alt-info.o -c alt-info.c
 
 alt-info.so: alt-info.o
 	$(CC) $(LDFLAGS) -o alt-info.so alt-info.o
 
-alt-info-dbg.o: alt-info.c $(API_INC)/InkAPI.h
+alt-info-dbg.o: alt-info.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -DDEBUG -I$(API_INC) -o alt-info-dbg.o -c alt-info.c
 
 alt-info-dbg.so: alt-info-dbg.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/alt-info.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/alt-info.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/alt-info.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/alt-info/alt-info.c Fri Feb 19 05:37:28 2010
@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 #define DEBUG_TAG "alt-info-dbg"
 

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/Makefile.am?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/Makefile.am Fri Feb 19 05:37:28 2010
@@ -18,11 +18,11 @@
 LD=ld
 CFLAGS=@CFLAGS@ @SHARED_CFLAGS@
 LDFLAGS=@LDFLAGS@ @SHARED_LDFLAGS@
-API_INC=../../../include
+API_INC=../../../proxy/api/include
 
 default: append-transform-deprecated.so
 
-append-transform-deprecated.o: append-transform.deprecated.c $(API_INC)/InkAPI.h
+append-transform-deprecated.o: append-transform.deprecated.c $(API_INC)/ts.h
 	$(CC) $(CFLAGS) -I$(API_INC) -o append-transform-deprecated.o -c append-transform.deprecated.c
 
 append-transform-deprecated.so: append-transform-deprecated.o

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/append-transform.deprecated.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/append-transform.deprecated.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/append-transform.deprecated.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/append-transform-deprecated/append-transform.deprecated.c Fri Feb 19 05:37:28 2010
@@ -40,7 +40,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include "InkAPI.h"
+#include "ts.h"
 
 typedef struct
 {

Modified: incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/assembly.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/assembly.c?rev=911702&r1=911701&r2=911702&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/assembly.c (original)
+++ incubator/trafficserver/traffic/branches/dev/test/plugin/assembly/assembly.c Fri Feb 19 05:37:28 2010
@@ -216,7 +216,7 @@
 
 #include <string.h>
 
-#include "InkAPI.h"
+#include "ts.h"
 
 #include "common.h"
 #include "list.h"



Mime
View raw message