You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/09/23 21:22:38 UTC
svn commit: r1000590 - in /trafficserver/traffic/tags/2.1.3: ./
ci/rat-excludes.txt proxy/InkAPITest.cc proxy/mgmt2/RecordsConfig.cc
Author: jplevyak
Date: Thu Sep 23 19:22:38 2010
New Revision: 1000590
URL: http://svn.apache.org/viewvc?rev=1000590&view=rev
Log:
updated 2.1.3 with fixes from trunk
Modified:
trafficserver/traffic/tags/2.1.3/ (props changed)
trafficserver/traffic/tags/2.1.3/ci/rat-excludes.txt
trafficserver/traffic/tags/2.1.3/proxy/InkAPITest.cc
trafficserver/traffic/tags/2.1.3/proxy/mgmt2/RecordsConfig.cc
Propchange: trafficserver/traffic/tags/2.1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 23 19:22:38 2010
@@ -1,2 +1,3 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
+/trafficserver/traffic/trunk:1000520-1000588
Modified: trafficserver/traffic/tags/2.1.3/ci/rat-excludes.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.3/ci/rat-excludes.txt?rev=1000590&r1=1000589&r2=1000590&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.3/ci/rat-excludes.txt (original)
+++ trafficserver/traffic/tags/2.1.3/ci/rat-excludes.txt Thu Sep 23 19:22:38 2010
@@ -87,3 +87,5 @@ libinktomi++/ink_rand.cc
README.libev
README-EC2
REVIEWERS
+contrib/perl/AdminClient/Changes
+contrib/perl/AdminClient/MANIFEST
Modified: trafficserver/traffic/tags/2.1.3/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.3/proxy/InkAPITest.cc?rev=1000590&r1=1000589&r2=1000590&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.3/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/tags/2.1.3/proxy/InkAPITest.cc Thu Sep 23 19:22:38 2010
@@ -863,10 +863,7 @@ REGRESSION_TEST(SDK_API_INKfopen) (Regre
SDK_RPRINT(test, "INKfopen", "TestCase1", TC_PASS, "ok");
// Create unique tmp _file_name_, do not use any TS file_name
- // XXX: Where is this file created?
- // It should be temporary file I presume so it should be
- // created either in /tmp or runtimedir
- snprintf(write_file_name, PATH_NAME_MAX, "%sXXXXXX", PFX);
+ snprintf(write_file_name, PATH_NAME_MAX, "/tmp/%sXXXXXX", PFX);
int write_file_fd; // this file will be reopened below
if ((write_file_fd = mkstemp(write_file_name)) <= 0) {
SDK_RPRINT(test, "mkstemp", "std func", TC_FAIL, "can't create file for writing");
Modified: trafficserver/traffic/tags/2.1.3/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.3/proxy/mgmt2/RecordsConfig.cc?rev=1000590&r1=1000589&r2=1000590&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.3/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/tags/2.1.3/proxy/mgmt2/RecordsConfig.cc Thu Sep 23 19:22:38 2010
@@ -1639,6 +1639,11 @@ RecordElement RecordsConfig[] = {
//# Cluster Subsystem
//#
//##############################################################################
+ //# cluster type requires restart to change
+ //# 1 is full clustering, 2 is mgmt only, 3 is no clustering
+ //# TODO: cluster.type is duplicated, because of weird dependencies.
+ {LOCAL, "proxy.local.cluster.type", "", INK_INT, "3", RU_RESTART_TM, RR_NULL, RC_NULL, NULL, RA_NULL}
+ ,
{CONFIG, "proxy.config.cluster.cluster_configuration", "", INK_STRING, "cluster.config", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
,
@@ -2252,6 +2257,11 @@ RecordElement RecordsConfig[] = {
{CONFIG, "proxy.config.url_remap.url_remap_mode", "", INK_INT, "1", RU_RESTART_TS, RR_NULL, RC_INT, "[0-2]", RA_NULL}
,
//##############################################################################
+ //# SSL: This is modularized, but doesn't work unless it's defined here.
+ //##############################################################################
+ {CONFIG, "proxy.config.ssl.enabled", "", INK_INT, "0", RU_RESTART_TS, RR_NULL, RC_INT, "[0-1]", RA_NULL}
+ ,
+ //##############################################################################
//# ICP Configuration
//##############################################################################
//# enabled=0 ICP disabled