You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/05/14 02:58:14 UTC
[1/2] git commit: TS-2805: Client connections are connecting with
SPDY 3 instead of 3.1
Repository: trafficserver
Updated Branches:
refs/heads/master aacc6b5f9 -> 704c50fee
TS-2805: Client connections are connecting with SPDY 3 instead of 3.1
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/02f74697
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/02f74697
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/02f74697
Branch: refs/heads/master
Commit: 02f746971d7d121b301bebcff4fe21248dba0f32
Parents: 842a06e
Author: Brian Geffon <br...@apache.org>
Authored: Tue May 13 17:57:13 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue May 13 17:57:13 2014 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
proxy/http/HttpProxyServerMain.cc | 9 ++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02f74697/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a76255b..4d062d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2805] Client connections are connecting with SPDY 3 instead of 3.1
+
*) [TS-2797] Build all manual pages in the doc/reference/api directory
*) [TS-2733] Do not build the old SPDY plugin.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/02f74697/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 6496672..e7a26b9 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -176,16 +176,19 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor& acceptor, HttpProxyPort& port, unsigned
//
// ALPN selects the first server-offered protocol,
// so make sure that we offer the newest protocol first.
- //
+ // But since registerEndpoint prepends you want to
+ // register them backwards, so you'd want to register
+ // the least important protocol first:
+ // http/1.0, http/1.1, spdy/3, spdy/3.1
// HTTP
- ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_1, http);
ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_0, http);
+ ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_1, http);
// SPDY
#if TS_HAS_SPDY
- ssl->registerEndpoint(TS_NPN_PROTOCOL_SPDY_3_1, spdy);
ssl->registerEndpoint(TS_NPN_PROTOCOL_SPDY_3, spdy);
+ ssl->registerEndpoint(TS_NPN_PROTOCOL_SPDY_3_1, spdy);
#endif
ink_scoped_mutex lock(ssl_plugin_mutex);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/704c50fe
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/704c50fe
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/704c50fe
Branch: refs/heads/master
Commit: 704c50fee677fd1dd8f96e0e924a7fa5fda9f10b
Parents: 02f7469 aacc6b5
Author: Brian Geffon <br...@apache.org>
Authored: Tue May 13 17:58:04 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue May 13 17:58:04 2014 -0700
----------------------------------------------------------------------
CHANGES | 4 ++++
lib/records/I_RecDefs.h | 16 ++++++++--------
lib/ts/apidefs.h.in | 16 ++++++++--------
proxy/InkAPI.cc | 2 +-
proxy/api/ts/ts.h | 2 +-
5 files changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/704c50fe/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 4d062d0,c065887..186a2fc
--- a/CHANGES
+++ b/CHANGES
@@@ -1,7 -1,9 +1,11 @@@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2805] Client connections are connecting with SPDY 3 instead of 3.1
++
+ *) [TS-2619] Changed TSRecordDump declaration from TSRecordType to int to accomodate
+ bitmasks. Also changed TSRecordType enums to hexidecimal, as this is easier to read
+ for bit arguments.
*) [TS-2797] Build all manual pages in the doc/reference/api directory