summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-02-11 07:53:16 +0100
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-02-11 07:53:16 +0100
commit40388d5acfce24452866e3d42a48a23c62d59307 (patch)
treef70abab923a9e40d31c22eb682b7883155307863
parent651b0dd97fa985a89b8321b8dad0dbc811aababf (diff)
downloadUXP-40388d5acfce24452866e3d42a48a23c62d59307.tar
UXP-40388d5acfce24452866e3d42a48a23c62d59307.tar.gz
UXP-40388d5acfce24452866e3d42a48a23c62d59307.tar.lz
UXP-40388d5acfce24452866e3d42a48a23c62d59307.tar.xz
UXP-40388d5acfce24452866e3d42a48a23c62d59307.zip
Bug 1351392 - Fix transport status events for http2 and ftp
-rw-r--r--netwerk/protocol/ftp/nsFtpConnectionThread.cpp2
-rw-r--r--netwerk/protocol/http/Http2Session.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
index d428b093c..1119fcff5 100644
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
@@ -2028,6 +2028,8 @@ nsFtpState::OnTransportStatus(nsITransport *transport, nsresult status,
case NS_NET_STATUS_RESOLVED_HOST:
case NS_NET_STATUS_CONNECTING_TO:
case NS_NET_STATUS_CONNECTED_TO:
+ case NS_NET_STATUS_TLS_HANDSHAKE_STARTING:
+ case NS_NET_STATUS_TLS_HANDSHAKE_ENDED:
break;
default:
return NS_OK;
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
index e649c3d8a..e1440d6a4 100644
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -2273,6 +2273,8 @@ Http2Session::OnTransportStatus(nsITransport* aTransport,
case NS_NET_STATUS_RESOLVED_HOST:
case NS_NET_STATUS_CONNECTING_TO:
case NS_NET_STATUS_CONNECTED_TO:
+ case NS_NET_STATUS_TLS_HANDSHAKE_STARTING:
+ case NS_NET_STATUS_TLS_HANDSHAKE_ENDED:
{
Http2Stream *target = mStreamIDHash.Get(1);
nsAHttpTransaction *transaction = target ? target->Transaction() : nullptr;