You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/06/09 16:53:01 UTC
svn commit: r1133903 - in /trafficserver/traffic/branches/3.0.x: ./ STATUS
mgmt/RecordsConfig.cc
Author: zwoop
Date: Thu Jun 9 14:53:01 2011
New Revision: 1133903
URL: http://svn.apache.org/viewvc?rev=1133903&view=rev
Log:
Backport TS-820 from trunk, thanks for the reviews
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/mgmt/RecordsConfig.cc
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 9 14:53:01 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268
+/trafficserver/traffic/trunk:1129268,1131473
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1133903&r1=1133902&r2=1133903&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Thu Jun 9 14:53:01 2011
@@ -39,11 +39,6 @@ A list of all bugs open for the next v3.
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
- * Logs: Restore old log buffer size.
- Trunk patch: http://svn.apache.org/viewvc?rev=1131473&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-820
- +1: zwoop, igalic, ming_zym
-
* SOCKS: Assertion/abort when starting TS with SOCKS proxy enabled
Trunk patch: http://svn.apache.org/viewvc?rev=1131080&view=rev
Jira: https://issues.apache.org/jira/browse/TS-818
Modified: trafficserver/traffic/branches/3.0.x/mgmt/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/mgmt/RecordsConfig.cc?rev=1133903&r1=1133902&r2=1133903&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/mgmt/RecordsConfig.cc (original)
+++ trafficserver/traffic/branches/3.0.x/mgmt/RecordsConfig.cc Thu Jun 9 14:53:01 2011
@@ -1134,7 +1134,7 @@ RecordElement RecordsConfig[] = {
//# 2: full logging
{RECT_CONFIG, "proxy.config.log.logging_enabled", RECD_INT, "3", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-4]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.log.log_buffer_size", RECD_INT, "16384", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.log.log_buffer_size", RECD_INT, "9216", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.log.max_entries_per_buffer", RECD_INT, "200", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,