Yeah, we did some updates for HttpDxe driver in edk2 trunk this day, which is conflicted with current HTTPS implementation.
I'm working on the merging work for this conflicts. But we need to sync edk2-staging/master with edk2/master first. Thanks. Jiaxin > -----Original Message----- > From: El-Haj-Mahmoud, Samer [mailto:[email protected]] > Sent: Friday, April 29, 2016 2:25 AM > To: Wu, Jiaxin <[email protected]>; [email protected] > Subject: [staging/HTTPs-TLS] merge from tianocore master > > Jiaxin, > > Can you please merge this revision into the edk2-staging/HTTPS-TLS branch, > since it conflicts with the TLS code? > > Thanks, > --Samer > > > Revision: 20667 > Author: edk2buildsystem > Date: Thursday, April 28, 2016 4:05:33 AM > Message: > NetworkPkg: Avoid the indefinite wait case in HttpDxe > > Need the timer check to avoid the indefinite wait case in HttpDxe driver > A.HTTP receive Header process in HttpTcpReceiveHeader(); B.HTTP receive > Body process in HttpTcpReceiveBody(); > > Cc: Hegde Nagaraj P <[email protected]> > Cc: El-Haj-Mahmoud Samer <[email protected]> > Cc: Ye Ting <[email protected]> > Cc: Fu Siyuan <[email protected]> > Cc: Zhang Lubo <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jiaxin Wu <[email protected]> > Reviewed-by: Hegde Nagaraj P <[email protected]> > Reviewed-by: Fu Siyuan <[email protected]> (cherry picked from commit > b347a22aecbfac9aac47831fee9a30aa810d6d0b) > ---- _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel

