Revision: 19335
http://sourceforge.net/p/edk2/code/19335
Author: luobozhang
Date: 2015-12-18 01:52:17 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
NetworkPkg:Fix the issue Http boot hang when network failed.
For both IPv4 and IPv6, when network transfer failed, such as disconnected
cable or disable http server, HTTP boot should exit back to the menu UI
rather than hang.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <[email protected]>
Reviewed-by: Ye Ting <[email protected]>
Reviewed-by: Wu Jiaxin <[email protected]>
Modified Paths:
--------------
trunk/edk2/NetworkPkg/HttpDxe/HttpProto.c
Modified: trunk/edk2/NetworkPkg/HttpDxe/HttpProto.c
===================================================================
--- trunk/edk2/NetworkPkg/HttpDxe/HttpProto.c 2015-12-18 00:53:25 UTC (rev
19334)
+++ trunk/edk2/NetworkPkg/HttpDxe/HttpProto.c 2015-12-18 01:52:17 UTC (rev
19335)
@@ -150,6 +150,9 @@
gBS->CloseEvent (Wrap->TcpWrap.Rx6Token.CompletionToken.Event);
if (EFI_ERROR (Wrap->TcpWrap.Rx6Token.CompletionToken.Status)) {
+ Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;
+ gBS->SignalEvent (Wrap->HttpToken->Event);
+ FreePool (Wrap);
return ;
}
@@ -157,6 +160,9 @@
gBS->CloseEvent (Wrap->TcpWrap.Rx4Token.CompletionToken.Event);
if (EFI_ERROR (Wrap->TcpWrap.Rx4Token.CompletionToken.Status)) {
+ Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;
+ gBS->SignalEvent (Wrap->HttpToken->Event);
+ FreePool (Wrap);
return ;
}
}
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
