You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/01/21 23:15:51 UTC
[1/3] trafficserver git commit: TS-3304: Add NULL check to
ink_inet_addr() input
Repository: trafficserver
Updated Branches:
refs/heads/4.2.x 7cf27625b -> 2e11b44b7
TS-3304: Add NULL check to ink_inet_addr() input
(cherry picked from commit f93ca30fd7e67168805c8bce0dd8f72a7fc73934)
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dbbbbab5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dbbbbab5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dbbbbab5
Branch: refs/heads/4.2.x
Commit: dbbbbab592a536960b43634fb6663530e9d4ed2b
Parents: 7cf2762
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jan 16 16:15:50 2015 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Wed Jan 21 14:42:03 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/ink_inet.cc | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbbbab5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6aefa99..a653697 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.3
+ *) [TS-3304] Add NULL check to ink_inet_addr() input.
+
*) [TS-898] Remove pointless NULL check on address of array.
*) [TS-2959] Fix compiler issue for MultiCache.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/dbbbbab5/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index 3221ab2..a9620b0 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -97,6 +97,10 @@ ink_inet_addr(const char *s)
int n = 0;
uint32_t base = 10;
+ if (NULL == s) {
+ return htonl((uint32_t) - 1);
+ }
+
while (n < 4) {
u[n] = 0;
[2/3] trafficserver git commit: TS-3283: Certain SSL handshake error
during client-hello hangs the client and leaves network connection open
Posted by so...@apache.org.
TS-3283: Certain SSL handshake error during client-hello hangs the client and leaves network connection open
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cadb017e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cadb017e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cadb017e
Branch: refs/heads/4.2.x
Commit: cadb017ecee0c53ab1cf9d5b0ab5f7ead9204156
Parents: dbbbbab
Author: Joe Chung <jo...@gmail.com>
Authored: Wed Jan 21 15:08:59 2015 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Wed Jan 21 15:08:59 2015 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
iocore/net/SSLNextProtocolAccept.cc | 13 ++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cadb017e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a653697..73c0c9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.2.3
+ *) [TS-3283] Certain SSL handshake error during client-hello hangs the client and
+ leaves network connection open.
+
*) [TS-3304] Add NULL check to ink_inet_addr() input.
*) [TS-898] Remove pointless NULL check on address of array.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cadb017e/iocore/net/SSLNextProtocolAccept.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNextProtocolAccept.cc b/iocore/net/SSLNextProtocolAccept.cc
index bfc2f0b..a5612c6 100644
--- a/iocore/net/SSLNextProtocolAccept.cc
+++ b/iocore/net/SSLNextProtocolAccept.cc
@@ -78,19 +78,22 @@ struct SSLNextProtocolTrampoline : public Continuation
Continuation * plugin;
SSLNetVConnection * netvc;
+ vio = static_cast<VIO *>(edata);
+ netvc = dynamic_cast<SSLNetVConnection *>(vio->vc_server);
+ ink_assert(netvc != NULL);
+
switch (event) {
case VC_EVENT_INACTIVITY_TIMEOUT:
- case VC_EVENT_READ_COMPLETE:
case VC_EVENT_ERROR:
- vio = static_cast<VIO *>(edata);
+ netvc->do_io(VIO::CLOSE);
+ delete this;
+ return EVENT_CONT;
+ case VC_EVENT_READ_COMPLETE:
break;
default:
return EVENT_ERROR;
}
- netvc = dynamic_cast<SSLNetVConnection *>(vio->vc_server);
- ink_assert(netvc != NULL);
-
plugin = netvc->endpoint();
if (plugin) {
send_plugin_event(plugin, NET_EVENT_ACCEPT, netvc);
[3/3] trafficserver git commit: Update CHANGES
Posted by so...@apache.org.
Update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2e11b44b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2e11b44b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2e11b44b
Branch: refs/heads/4.2.x
Commit: 2e11b44b7572111176c4af0bf7b1325e2e0e2fa7
Parents: cadb017
Author: Phil Sorber <so...@apache.org>
Authored: Wed Jan 21 15:11:32 2015 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Wed Jan 21 15:11:32 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e11b44b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 73c0c9d..13cb4d2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Changes with Apache Traffic Server 4.2.3
*) [TS-898] Remove pointless NULL check on address of array.
+ *) [TS-3262] Change abs() to std::abs(), avoid compiler errors.
+
*) [TS-2959] Fix compiler issue for MultiCache.
Changes with Apache Traffic Server 4.2.2