[trafficserver] branch master updated: TS-3922: Fix format warning

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  25e650b   TS-3922: Fix format warning
25e650b is described below

commit 25e650b95c0e2644b7fb1a161a1f43e5827d858f
Author: Brian Geffon 
AuthorDate: Wed Apr 20 22:46:51 2016 -0700

TS-3922: Fix format warning
---
 proxy/http/HttpSM.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 0d27e23..745394e 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -1586,14 +1586,14 @@ HttpSM::handle_api_return()
 
HTTP_INCREMENT_DYN_STAT(http_websocket_current_active_client_connections_stat);
 
 if (ua_session) {
-  DebugSM("http_websocket", "(client session) Setting websocket active 
timeout=%ld s and inactive timeout=%ld s",
+  DebugSM("http_websocket", "(client session) Setting websocket active 
timeout=%" PRId64 "s and inactive timeout=%" PRId64 "s",
   t_state.txn_conf->websocket_active_timeout, 
t_state.txn_conf->websocket_inactive_timeout);
   
ua_session->get_netvc()->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->websocket_active_timeout));
   
ua_session->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->websocket_inactive_timeout));
 }
 
 if (server_session) {
-  DebugSM("http_websocket", "(server session) Setting websocket active 
timeout=%ld s and inactive timeout=%ld s",
+  DebugSM("http_websocket", "(server session) Setting websocket active 
timeout=%" PRId64 "s and inactive timeout=%" PRId64 "s",
   t_state.txn_conf->websocket_active_timeout, 
t_state.txn_conf->websocket_inactive_timeout);
   
server_session->get_netvc()->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->websocket_active_timeout));
   
server_session->get_netvc()->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->websocket_inactive_timeout));

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].

[trafficserver] branch master updated: Fix typo in README

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  780d237   Fix typo in README
780d237 is described below

commit 780d237a03d69d37ff06848fddebe5cc1ce11b43
Author: Brian Geffon 
AuthorDate: Wed Apr 20 21:42:41 2016 -0700

Fix typo in README
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 3d7756b..4ff28f5 100644
--- a/README
+++ b/README
@@ -30,7 +30,7 @@ plugins to build large scale web applications.
   |-- hostdb/  Internal DNS cache
   |-- net/ ... Network
   |-- lib/ ...
-  |-- cpp11api ... C++ '11 wrapper for plugin developers
+  |-- atscppapi/ ... C++ api wrapper for plugin developers
   |-- records/ ... library for config files
   |-- perl/ .. Perl libraries for e.g. mgmt access and 
configurations
   |-- ts/  Base / core library

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].

[trafficserver] branch master updated: TS-3922: Add independent websocket timeouts. This closes #590

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  1466cca   TS-3922: Add independent websocket timeouts. This closes 
#590
1466cca is described below

commit 1466ccadd2c3cee31de9835249bf24f29a1d9ea1
Author: Brian Geffon 
AuthorDate: Wed Apr 20 21:32:03 2016 -0700

TS-3922: Add independent websocket timeouts. This closes #590
---
 doc/admin-guide/files/records.config.en.rst | 12 
 iocore/net/UnixNet.cc   |  9 +
 mgmt/RecordsConfig.cc   |  4 
 proxy/http/HttpConfig.cc|  5 +
 proxy/http/HttpConfig.h | 16 +---
 proxy/http/HttpSM.cc| 14 ++
 6 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/doc/admin-guide/files/records.config.en.rst 
b/doc/admin-guide/files/records.config.en.rst
index b3421ba..a5f5889 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -1121,6 +1121,18 @@ HTTP Connection Timeouts
 
Specifies how long Traffic Server keeps connections to origin servers open 
if the transaction stalls.
 
+.. ts:cv:: CONFIG proxy.config.websocket.no_activity_timeout INT 600
+   :reloadable:
+   :overridable:
+
+   Specifies how long Traffic Server keeps connections open if a websocket 
stalls.
+
+.. ts:cv:: CONFIG proxy.config.websocket.active_timeout INT 3600
+   :reloadable:
+   :overridable:
+
+   The maximum amount of time Traffic Server keeps websocket connections open.
+
 .. ts:cv:: CONFIG proxy.config.http.transaction_active_timeout_in INT 900
:reloadable:
 
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index d749844..5066b47 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -85,8 +85,9 @@ public:
 vc->set_inactivity_timeout(HRTIME_SECONDS(default_inactivity_timeout));
 NET_INCREMENT_DYN_STAT(default_inactivity_timeout_stat);
   } else {
-Debug("inactivity_cop_verbose", "vc: %p now: %" PRId64 " timeout at: 
%" PRId64 " timeout in: %" PRId64, vc, now,
-  ink_hrtime_to_sec(vc->next_inactivity_timeout_at), 
ink_hrtime_to_sec(vc->inactivity_timeout_in));
+Debug("inactivity_cop_verbose", "vc: %p now: %" PRId64 " timeout at: 
%" PRId64 " timeout in: %" PRId64, vc,
+  ink_hrtime_to_sec(now), 
ink_hrtime_to_sec(vc->next_inactivity_timeout_at),
+  ink_hrtime_to_sec(vc->inactivity_timeout_in));
   }
 
   if (vc->next_inactivity_timeout_at && vc->next_inactivity_timeout_at < 
now) {
@@ -96,8 +97,8 @@ public:
   NET_SUM_DYN_STAT(keep_alive_queue_timeout_total_stat, diff);
   NET_INCREMENT_DYN_STAT(keep_alive_queue_timeout_count_stat);
 }
-Debug("inactivity_cop_verbose", "vc: %p now: %" PRId64 " timeout at: 
%" PRId64 " timeout in: %" PRId64, vc, now,
-  vc->next_inactivity_timeout_at, vc->inactivity_timeout_in);
+Debug("inactivity_cop_verbose", "vc: %p now: %" PRId64 " timeout at: 
%" PRId64 " timeout in: %" PRId64, vc,
+  ink_hrtime_to_sec(now), vc->next_inactivity_timeout_at, 
vc->inactivity_timeout_in);
 vc->handleEvent(EVENT_IMMEDIATE, e);
   }
 }
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 55d9cdc..0ce9df9 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -539,6 +539,10 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.http.keep_alive_no_activity_timeout_out", 
RECD_INT, "120", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
   ,
+  {RECT_CONFIG, "proxy.config.websocket.no_activity_timeout", RECD_INT, "600", 
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  ,
+  {RECT_CONFIG, "proxy.config.websocket.active_timeout", RECD_INT, "3600", 
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
+  ,
   {RECT_CONFIG, "proxy.config.http.transaction_no_activity_timeout_in", 
RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.http.transaction_no_activity_timeout_out", 
RECD_INT, "30", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 3ab4a88..885ff3c 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -942,6 +942,9 @@ HttpConfig::startup()
 
"proxy.config.http.transaction_no_activity_timeout_in");
   
HttpEstablishStaticConfigLongLong(c.oride.transaction_no_activity_timeout_out,
 
"proxy.config.http.transaction_no_activity_timeout_out");
+  HttpEstablishStaticConfigLongLong(c.oride.websocket_active_timeout, 
"proxy.config.websocket.active_timeout");
+

[trafficserver] branch master updated: TS-4369: Add VIA_ERROR_MOVED_TEMPORARILY. This closes #586

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
   new  af7832d   TS-4369: Add VIA_ERROR_MOVED_TEMPORARILY. This closes #586
af7832d is described below

commit af7832d229d6746edfd5010ab013fce0bbf20c21
Author: Brian Geffon 
AuthorDate: Wed Apr 20 21:26:59 2016 -0700

TS-4369: Add VIA_ERROR_MOVED_TEMPORARILY. This closes #586
---
 cmd/traffic_via/traffic_via.cc | 1 +
 doc/appendices/faq.en.rst  | 1 +
 proxy/http/HttpTransact.cc | 2 +-
 proxy/http/HttpTransact.h  | 1 +
 proxy/http/README.via  | 3 +++
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index 82b9ad3..c816f5a 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -176,6 +176,7 @@ standardViaLookup(char flag)
 viaTable->viaData[(unsigned char)'N'] = "no error";
 viaTable->viaData[(unsigned char)'F'] = "request forbidden";
 viaTable->viaData[(unsigned char)'R'] = "cache read error";
+viaTable->viaData[(unsigned char)'M'] = "moved temporarily";
 viaTable->viaData[(unsigned char)' '] = "unknown";
 break;
   default:
diff --git a/doc/appendices/faq.en.rst b/doc/appendices/faq.en.rst
index d8646c5..4951403 100644
--- a/doc/appendices/faq.en.rst
+++ b/doc/appendices/faq.en.rst
@@ -229,6 +229,7 @@ F request forbidden
 H header syntax unacceptable
 N no error
 R cache read error
+M moved temporarily
 S server related error
 T connection timed out
 = ==
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 867ad2a..aa3f143 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -8135,7 +8135,7 @@ HttpTransact::build_error_response(State *s, HTTPStatus 
status_code, const char
 SET_VIA_STRING(VIA_ERROR_TYPE, VIA_ERROR_DNS_FAILURE);
 break;
   case HTTP_STATUS_MOVED_TEMPORARILY:
-SET_VIA_STRING(VIA_ERROR_TYPE, VIA_ERROR_SERVER);
+SET_VIA_STRING(VIA_ERROR_TYPE, VIA_ERROR_MOVED_TEMPORARILY);
 break;
   case HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED:
 SET_VIA_STRING(VIA_CLIENT_REQUEST, VIA_CLIENT_ERROR);
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 5173229..ad9acea 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -183,6 +183,7 @@ enum ViaString_t {
   VIA_ERROR_SERVER = 'S',
   VIA_ERROR_TIMEOUT = 'T',
   VIA_ERROR_CACHE_READ = 'R',
+  VIA_ERROR_MOVED_TEMPORARILY = 'M',
   //
   // Now the detailed stuff
   //
diff --git a/proxy/http/README.via b/proxy/http/README.via
index c5c954f..04c4a81 100644
--- a/proxy/http/README.via
+++ b/proxy/http/README.via
@@ -12,6 +12,7 @@
  Ain cache, not acceptable
  Sin cache, stale
  Hin cache, fresh
+ Rin cache, fresh RAM hit
  
   server stuff
  Eerror in response
@@ -35,6 +36,8 @@
  Ddns failure
  Frequest forbidden
  Hheader syntax unacceptable
+ Mmoved temporarily
+ Rcache read error
  Sserver related error
  Tconnection timed out
  

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].

[trafficserver] branch master updated (0bd26e9 -> ba33d1c)

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.

  from  0bd26e9   Merge pull request #587 from zizhong/bad_comma
  adds  c953da0   TS-4365: Prevent invalid clang-analyzer memory leak 
warnings in atscppapi
   new  ba33d1c   Merge pull request #592 from bgaff/TS-4365

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc  |  9 ++---
 .../async_http_fetch_streaming/AsyncHttpFetchStreaming.cc  |  5 +
 lib/atscppapi/examples/async_timer/AsyncTimer.cc   |  6 ++
 lib/atscppapi/examples/boom/boom.cc|  7 ++-
 lib/atscppapi/examples/clientredirect/ClientRedirect.cc|  7 ++-
 lib/atscppapi/examples/clientrequest/ClientRequest.cc  |  7 ++-
 .../custom_error_remap_plugin/CustomErrorRemapPlugin.cc|  7 ++-
 lib/atscppapi/examples/customresponse/CustomResponse.cc|  7 ++-
 lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc  |  7 ++-
 .../examples/gzip_transformation/GzipTransformationPlugin.cc   |  7 ++-
 lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc  |  9 -
 lib/atscppapi/examples/intercept/intercept.cc  |  7 ++-
 .../InternalTransactionHandling.cc | 10 --
 lib/atscppapi/examples/logger_example/LoggerExample.cc |  3 ++-
 .../MultipleTransactionHookPlugins.cc  |  6 +-
 .../null_transformation_plugin/NullTransformationPlugin.cc |  3 ++-
 lib/atscppapi/examples/post_buffer/PostBuffer.cc   |  7 ++-
 lib/atscppapi/examples/remap_plugin/RemapPlugin.cc |  7 ++-
 lib/atscppapi/examples/serverresponse/ServerResponse.cc|  7 ++-
 lib/atscppapi/examples/stat_example/StatExample.cc |  4 +++-
 lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc |  7 ++-
 .../examples/transactionhook/TransactionHookPlugin.cc  |  7 ++-
 22 files changed, 123 insertions(+), 23 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" '].

[trafficserver] 01/01: Merge pull request #592 from bgaff/TS-4365

2016-04-20 Thread briang 
This is an automated email from the ASF dual-hosted git repository.

briang pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit ba33d1cbf6508e04d4a5164ab40e49fb577ce267
Merge: 0bd26e9 c953da0
Author: Brian Geffon 
AuthorDate: Thu Apr 21 11:49:12 2016 +0800

Merge pull request #592 from bgaff/TS-4365

TS-4365: Prevent invalid clang-analyzer memory leak warnings

 lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc  |  9 ++---
 .../async_http_fetch_streaming/AsyncHttpFetchStreaming.cc  |  5 +
 lib/atscppapi/examples/async_timer/AsyncTimer.cc   |  6 ++
 lib/atscppapi/examples/boom/boom.cc|  7 ++-
 lib/atscppapi/examples/clientredirect/ClientRedirect.cc|  7 ++-
 lib/atscppapi/examples/clientrequest/ClientRequest.cc  |  7 ++-
 .../custom_error_remap_plugin/CustomErrorRemapPlugin.cc|  7 ++-
 lib/atscppapi/examples/customresponse/CustomResponse.cc|  7 ++-
 lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc  |  7 ++-
 .../examples/gzip_transformation/GzipTransformationPlugin.cc   |  7 ++-
 lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc  |  9 -
 lib/atscppapi/examples/intercept/intercept.cc  |  7 ++-
 .../InternalTransactionHandling.cc | 10 --
 lib/atscppapi/examples/logger_example/LoggerExample.cc |  3 ++-
 .../MultipleTransactionHookPlugins.cc  |  6 +-
 .../null_transformation_plugin/NullTransformationPlugin.cc |  3 ++-
 lib/atscppapi/examples/post_buffer/PostBuffer.cc   |  7 ++-
 lib/atscppapi/examples/remap_plugin/RemapPlugin.cc |  7 ++-
 lib/atscppapi/examples/serverresponse/ServerResponse.cc|  7 ++-
 lib/atscppapi/examples/stat_example/StatExample.cc |  4 +++-
 lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc |  7 ++-
 .../examples/transactionhook/TransactionHookPlugin.cc  |  7 ++-
 22 files changed, 123 insertions(+), 23 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" .

svn commit: r986196 - in /websites/staging/trafficserver/trunk: cgi-bin/ content/

2016-04-20 Thread buildbot 
Author: buildbot
Date: Wed Apr 20 20:12:13 2016
New Revision: 986196

Log:
Staging update by buildbot for trafficserver

Modified:
websites/staging/trafficserver/trunk/cgi-bin/   (props changed)
websites/staging/trafficserver/trunk/content/   (props changed)

Propchange: websites/staging/trafficserver/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 20 20:12:13 2016
@@ -1 +1 @@
-1738937
+1740188

Propchange: websites/staging/trafficserver/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Apr 20 20:12:13 2016
@@ -1 +1 @@
-1738937
+1740188