diff options
| author | Zhang Lubo <lubo.zhang@intel.com> | 2015-09-06 02:18:22 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-09-06 02:18:22 +0000 |
| commit | 7027b268bf1887f7393487574dba309fda84bb74 (patch) | |
| tree | 3f248b2348e49e38aacc73927bd62fb7cbf178e2 | |
| parent | 3751df6c38a201e4ceb8f284737164bbacdb8d1d (diff) | |
| download | edk2-platforms-7027b268bf1887f7393487574dba309fda84bb74.tar.xz | |
NetworkPkg: Fix the HttpCloseConnection fail issue
When HTTP server is unavailable,HttpCloseConnection will enter
infinite loop to wait for TCP4->close Event return, So we need to
decide the Http Instance state whether in the appropriate state
before close it.
(Sync patch r18400 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@18402 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpImpl.c | 1 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpProto.c | 25 |
2 files changed, 15 insertions, 11 deletions
diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 5b3c5d058c..dc06b9855c 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -516,6 +516,7 @@ Error2: HttpCloseTcp4ConnCloseEvent (HttpInstance);
if (NULL != Wrap->TcpWrap.TxToken.CompletionToken.Event) {
gBS->CloseEvent (Wrap->TcpWrap.TxToken.CompletionToken.Event);
+ Wrap->TcpWrap.TxToken.CompletionToken.Event = NULL;
}
Error1:
diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index 829758ad5e..e8ce9879f3 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -243,10 +243,12 @@ HttpCloseTcp4ConnCloseEvent ( if (NULL != HttpInstance->ConnToken.CompletionToken.Event) {
gBS->CloseEvent (HttpInstance->ConnToken.CompletionToken.Event);
+ HttpInstance->ConnToken.CompletionToken.Event = NULL;
}
if (NULL != HttpInstance->CloseToken.CompletionToken.Event) {
gBS->CloseEvent(HttpInstance->CloseToken.CompletionToken.Event);
+ HttpInstance->CloseToken.CompletionToken.Event = NULL;
}
}
@@ -581,21 +583,22 @@ HttpCloseConnection ( {
EFI_STATUS Status;
- HttpInstance->CloseToken.AbortOnClose = TRUE;
- HttpInstance->IsCloseDone = FALSE;
-
-
- Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->CloseToken);
- if (EFI_ERROR (Status)) {
- return Status;
- }
+ if (HttpInstance->State == HTTP_STATE_TCP_CONNECTED) {
+ HttpInstance->CloseToken.AbortOnClose = TRUE;
+ HttpInstance->IsCloseDone = FALSE;
+
+ Status = HttpInstance->Tcp4->Close (HttpInstance->Tcp4, &HttpInstance->CloseToken);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
- while (!HttpInstance->IsCloseDone) {
- HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);
+ while (!HttpInstance->IsCloseDone) {
+ HttpInstance->Tcp4->Poll (HttpInstance->Tcp4);
+ }
}
HttpInstance->State = HTTP_STATE_TCP_CLOSED;
- return Status;
+ return EFI_SUCCESS;
}
/**
|