trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geor...@apache.org
Subject svn commit: r909544 - in /incubator/trafficserver/traffic/branches/dev: ./ contrib/ proxy/ proxy/config/ proxy/http2/remap/ proxy/mgmt2/ proxy/mgmt2/web2/
Date Fri, 12 Feb 2010 18:14:18 GMT
Author: georgep
Date: Fri Feb 12 18:14:15 2010
New Revision: 909544

URL: http://svn.apache.org/viewvc?rev=909544&view=rev
Log:
Merge changes from TS-175,TS-160,TS-166,TS-74 from trunk to dev branch. 

Added:
    incubator/trafficserver/traffic/branches/dev/contrib/
      - copied from r909513, incubator/trafficserver/traffic/trunk/contrib/
    incubator/trafficserver/traffic/branches/dev/contrib/install_trafficserver.sh
      - copied unchanged from r909513, incubator/trafficserver/traffic/trunk/contrib/install_trafficserver.sh
    incubator/trafficserver/traffic/branches/dev/contrib/set_trafficserver.sh
      - copied unchanged from r909513, incubator/trafficserver/traffic/trunk/contrib/set_trafficserver.sh
Modified:
    incubator/trafficserver/traffic/branches/dev/   (props changed)
    incubator/trafficserver/traffic/branches/dev/Makefile.am
    incubator/trafficserver/traffic/branches/dev/NOTICE
    incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
    incubator/trafficserver/traffic/branches/dev/proxy/config/cache.config
    incubator/trafficserver/traffic/branches/dev/proxy/config/remap.config
    incubator/trafficserver/traffic/branches/dev/proxy/config/splitdns.config
    incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapProcessor.cc
    incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/UrlRewrite.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
    incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc

Propchange: incubator/trafficserver/traffic/branches/dev/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 18:14:15 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:891822-909127
+/incubator/trafficserver/traffic/trunk:891822-909513

Modified: incubator/trafficserver/traffic/branches/dev/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/Makefile.am?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/Makefile.am (original)
+++ incubator/trafficserver/traffic/branches/dev/Makefile.am Fri Feb 12 18:14:15 2010
@@ -30,6 +30,10 @@
 DIST_BUILD_USER_GROUP=`id -ng`
 DISTCHECK_CONFIGURE_FLAGS=--with-user=${DIST_BUILD_USER} --with-group=${DIST_BUILD_USER_GROUP}
 
+installcheck-local:
+	$(DESTDIR)$(bindir)/traffic_server -R 1
+
+
 doxygen:
 	$(MAKE) -C doc doxygen
 

Modified: incubator/trafficserver/traffic/branches/dev/NOTICE
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/NOTICE?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/NOTICE (original)
+++ incubator/trafficserver/traffic/branches/dev/NOTICE Fri Feb 12 18:14:15 2010
@@ -1,5 +1,5 @@
 Apache Traffic Server
-Copyright 2009 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/InkAPITest.cc Fri Feb 12 18:14:15 2010
@@ -116,7 +116,7 @@
     return;
   }
 
-  if (major_ts_version < 5) {
+  if (major_ts_version < 2) {
     SDK_RPRINT(test, "INKTrafficServerVersionGet", "TestCase3", TC_FAIL, "traffic server
major version is incorrect");
     *pstatus = REGRESSION_TEST_FAILED;
     return;
@@ -178,8 +178,8 @@
     return;
   }
 
-  if (strstr(plugin_dir, "etc/trafficserver/plugin") == NULL) {
-    SDK_RPRINT(test, "INKPluginDirGet", "TestCase2", TC_FAIL, "plugin dir is incorrect");
+  if (strstr(plugin_dir, "libexec/trafficserver") == NULL) {
+    SDK_RPRINT(test, "INKPluginDirGet", "TestCase2", TC_FAIL, "plugin dir(%s) is incorrect,
expected (%s) in path",plugin_dir,"libexec/trafficserver");
     *pstatus = REGRESSION_TEST_FAILED;
     return;
   }
@@ -3426,7 +3426,7 @@
 
   INKMLoc url_loc;
   INKMLoc url_loc_Get;
-  const char *url_host = "www.inktomi.com";
+  const char *url_host = "www.example.com";
   int url_port = 2345;
   const char *url_path = "abcd/efg/hij.htm";
 
@@ -3451,7 +3451,7 @@
   /* int version2; unused: lv */
 
   int length;
-  char *expected_iobuf = "GET http://www.inktomi.com:2345/abcd/efg/hij.htm HTTP/2.1\r\n\r\n";
+  char *expected_iobuf = "GET http://www.example.com:2345/abcd/efg/hij.htm HTTP/2.1\r\n\r\n";
   int actual_length;
   int expected_length;
   bool test_passed_Http_Hdr_Create = false;
@@ -5390,7 +5390,7 @@
 REGRESSION_TEST(SDK_API_INKHttpHdrParse) (RegressionTest * test, int atype, int *pstatus)
{
 
   char *req =
-    "GET http://www.inktomi.com/ HTTP/1.1\r\nmimefield1:field1value1,field1value2\r\nmimefield2:field2value1,field2value2\r\n\r\n";
+    "GET http://www.example.com/ HTTP/1.1\r\nmimefield1:field1value1,field1value2\r\nmimefield2:field2value1,field2value2\r\n\r\n";
   char *resp =
     "HTTP/1.1 200 OK\r\n1mimefield:1field1value,1field2value\r\n2mimefield:2field1value,2field2value\r\n\r\n";
   const char *start;
@@ -6227,7 +6227,7 @@
 
 REGRESSION_TEST(SDK_API_INKUrlParse) (RegressionTest * test, int atype, int *pstatus) {
 
-  char *url = "http://abc:def@www.inktomi.com:3426/homepage.cgi;ab?abc=def#abc";
+  char *url = "http://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc";
   const char *start;
   char *end;
   char *temp;
@@ -6444,7 +6444,7 @@
   int CONFIG_PARAM_INT_VALUE = 1;
 
   char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
-  char *CONFIG_PARAM_STRING_VALUE = "Traffic Edge";
+  char *CONFIG_PARAM_STRING_VALUE = "Traffic Server";
 
   *pstatus = REGRESSION_TEST_INPROGRESS;
 
@@ -6554,7 +6554,7 @@
       if ( _x - ORIG_##_x != 0) { \
           test_passed = false; \
           SDK_RPRINT (test, "##_x", "TestCase1", TC_FAIL, \
-                      "Original Value = %d; New Value = %d \n", _x, ORIG_##_x); \
+		      "%s:Original Value = %d; New Value = %d \n", #_x,_x, ORIG_##_x); \
       } \
 }
 
@@ -6637,6 +6637,7 @@
   ORIG_INK_HTTP_SSN_START_HOOK,
   ORIG_INK_HTTP_SSN_CLOSE_HOOK,
   ORIG_INK_HTTP_CACHE_LOOKUP_COMPLETE_HOOK,
+  ORIG_INK_HTTP_READ_REQUEST_PRE_REMAP_HOOK,
   ORIG_INK_HTTP_LAST_HOOK
 } ORIG_INKHttpHookID;
 
@@ -6952,7 +6953,7 @@
 checkHttpTxnParentProxy(ContData * data, INKHttpTxn txnp)
 {
 
-  char *hostname = "npdev.inktomi.com";
+  char *hostname = "txnpp.example.com";
   int port = 10180;
   char *hostnameget = NULL;
   int portget = 0;

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/cache.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/cache.config?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/cache.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/cache.config Fri Feb 12 18:14:15
2010
@@ -48,10 +48,5 @@
 #
 # Examples
 #
-#  Revalidate all http objects from inktomi.com after 2 hours 
-#    dest_domain=inktomi.com   scheme=http  revalidate=2h
-#
-#  Revalidate all ftp objects from inktomi.com after 2 days
-#    dest_domain=inktomi.com   scheme=ftp  revalidate=2d
-#
-#
+#  Revalidate all http objects from www.example.com after 2 hours 
+#    dest_domain=www.example.com   scheme=http  revalidate=2h

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/remap.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/remap.config?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/remap.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/remap.config Fri Feb 12 18:14:15
2010
@@ -27,11 +27,11 @@
 #  proxy mode so that user agents know to contact Traffic Server and not
 #  attempt to contact the Origin Server directly.
 #
-#  For example, you can set up a reverse proxy for www.inktomi.com with the
-#  real content situated at server1.inktomi.com with the rules:
+#  For example, you can set up a reverse proxy for www.example.com with the
+#  real content situated at server1.example.com with the rules:
 #
-#  map          http://www.inktomi.com/      http://server1.inktomi.com/
-#  reverse_map  http://server1.inktomi.com/  http://www.inktomi.com/
+#  map          http://www.example.com/      http://server1.example.com/
+#  reverse_map  http://server1.example.com/  http://www.example.com/
 #
 #  Or you could permanently redirect users trying to access www.oldserver.com
 #  to www.newserver.com with the following rule:

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/splitdns.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/splitdns.config?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/splitdns.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/splitdns.config Fri Feb 12 18:14:15
2010
@@ -49,7 +49,7 @@
 # will terminate the search.
 #
 # If a host name is not fully qualified, i.e. does not have the domain 
-# specifier (ex. 'internal' instead of internal.inktomi.com'), the system
+# specifier (ex. 'internal' instead of internal.example.com'), the system
 # uses the 'proxy.config.dns.splitdns.def_domain' value to append to the
 # host name. If 'proxy.config.dns.splitdns.def_domain' is not set, and 
 # there is no rule using the primary destination specifier 'url_regex', 

Modified: incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/config/storage.config Fri Feb 12 18:14:15
2010
@@ -56,8 +56,6 @@
 #        mknod /dev/raw_sdc c 162 2
 #        mknod /dev/raw_sdd c 162 3
 #
-#        IMPORTANT: make sure to chown '/dev/raw/rawN' devices to user 'inktomi'
-#
 #        and bind them to whatever block devices you want to use:
 #
 #        /usr/bin/raw /dev/raw_sdb /dev/sdb

Modified: incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapProcessor.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapProcessor.cc?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapProcessor.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/http2/remap/RemapProcessor.cc Fri Feb
12 18:14:15 2010
@@ -260,7 +260,7 @@
       ((rewrite_table->pristine_host_hdr <= 0 && s->pristine_host_hdr <=
0) ||
        (rewrite_table->pristine_host_hdr > 0 && s->pristine_host_hdr ==
0))) {
     remapped_host = request_url->host_get(&remapped_host_len);
-    remapped_port = request_url->port_get();
+    remapped_port = request_url->port_get_raw();
 
     // Debug code to print out old host header.  This was easier before
     //  the header conversion.  Now we have to copy to gain null
@@ -283,7 +283,9 @@
     if (host_buf_len > remapped_host_len) {
       tmp = remapped_host_len;
       memcpy(host_hdr_buf, remapped_host, remapped_host_len);
-      tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len
- 1, ":%d", remapped_port);
+      if (remapped_port) {
+        tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len
- 1, ":%d", remapped_port);
+    }
     } else {
       tmp = host_buf_len;
     }

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=909544&r1=909543&r2=909544&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 12
18:14:15 2010
@@ -1264,7 +1264,7 @@
         ((pristine_host_hdr <= 0 && s->pristine_host_hdr <= 0) ||
          (pristine_host_hdr > 0 && s->pristine_host_hdr == 0))) {
       remapped_host = request_url->host_get(&remapped_host_len);
-      remapped_port = request_url->port_get();
+      remapped_port = request_url->port_get_raw();
 
       // Debug code to print out old host header.  This was easier before
       //  the header conversion.  Now we have to copy to gain null
@@ -1288,8 +1288,10 @@
       if (host_buf_len > remapped_host_len) {
         tmp = remapped_host_len;
         memcpy(host_hdr_buf, remapped_host, remapped_host_len);
-        tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len
- 1,
-                            ":%d", remapped_port);
+        if (remapped_port) {
+          tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len
- 1,
+                              ":%d", remapped_port);
+        }
       } else {
         tmp = host_buf_len;
       }

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/RecordsConfig.cc Fri Feb 12 18:14:15
2010
@@ -43,12 +43,12 @@
   //# System Variables
   //#
   //##############################################################################
-  {CONFIG, "proxy.config.product_company", "", INK_STRING, "Apache Project", RU_NULL, RR_NULL,
RC_NULL, NULL,
+  {CONFIG, "proxy.config.product_company", "", INK_STRING, "Apache Software Foundation",
RU_NULL, RR_NULL, RC_NULL, NULL,
    RA_NULL}
   ,
   {CONFIG, "proxy.config.product_vendor", "", INK_STRING, "Apache", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.product_name", "", INK_STRING, "Traffic Edge", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
+  {CONFIG, "proxy.config.product_name", "", INK_STRING, "Traffic Server", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.cop_name", "", INK_STRING, "Traffic Cop", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
@@ -447,7 +447,7 @@
   ,
   //##############################################################################
   //#
-  //# Inktomi Traffic Net
+  //# Traffic Net
   //#
   //##############################################################################
   {CONFIG, "proxy.config.traffic_net.traffic_net_mode", "", INK_INT, "3", RU_REREAD, RR_NULL,
RC_INT, "[0-3]", RA_NULL}
@@ -459,7 +459,7 @@
   ,
   {CONFIG, "proxy.config.traffic_net.traffic_net_lid", "", INK_STRING, NULL, RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.traffic_net.traffic_net_server", "", INK_STRING, "sm-linux-1.inktomi.com",
RU_NULL, RR_NULL,
+  {CONFIG, "proxy.config.traffic_net.traffic_net_server", "", INK_STRING, "sm-linux-1.example.com",
RU_NULL, RR_NULL,
    RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.traffic_net.traffic_net_port", "", INK_INT, "80", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
@@ -3298,7 +3298,7 @@
   //##############################################################################
   {CONFIG, "proxy.config.aaa.billing.reporting_interval", "", INK_INT, "300", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.aaa.billing.machine_name", "", INK_STRING, "wire-dev02.inktomi.com",
RU_NULL, RR_NULL, RC_NULL,
+  {CONFIG, "proxy.config.aaa.billing.machine_name", "", INK_STRING, "wire-dev02.example.com",
RU_NULL, RR_NULL, RC_NULL,
    NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.aaa.billing.install_directory", "", INK_STRING, "/opt/portal/6.0",
RU_NULL, RR_NULL, RC_NULL,
@@ -3325,7 +3325,7 @@
   ,
   {CONFIG, "proxy.config.aaa.radius.is_proxy", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
   ,
-  {CONFIG, "proxy.config.aaa.radius.radius_server_ip", "", INK_STRING, "cachedev.inktomi.com",
RU_NULL, RR_NULL,
+  {CONFIG, "proxy.config.aaa.radius.radius_server_ip", "", INK_STRING, "cachedev.example.com",
RU_NULL, RR_NULL,
    RC_NULL, NULL, RA_NULL}
   ,
   {CONFIG, "proxy.config.aaa.radius.radius_server_auth_port", "", INK_INT, "1812", RU_NULL,
RR_NULL, RC_NULL, NULL,

Modified: incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc?rev=909544&r1=909543&r2=909544&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ incubator/trafficserver/traffic/branches/dev/proxy/mgmt2/web2/WebHttpRender.cc Fri Feb
12 18:14:15 2010
@@ -1892,9 +1892,6 @@
 static int
 handle_version(WebHttpContext * whc, char *tag, char *arg)
 {
-  // bug 52754: For Tsunami only, need to hack in Traffic Edge 
-  // version "1.5.0" for the web UI; NEED TO REMOVE for post-tsunami release   
-  //whc->response_bdy->copyFrom(appVersionInfo.VersionStr, strlen(appVersionInfo.VersionStr));
   whc->response_bdy->copyFrom(PACKAGE_VERSION, strlen(PACKAGE_VERSION));
   return WEB_HTTP_ERR_OKAY;
 }



Mime
View raw message