diff options
| author | Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com> | 2016-02-19 06:47:36 +0800 |
|---|---|---|
| committer | Fu Siyuan <siyuan.fu@intel.com> | 2016-02-25 15:02:31 +0800 |
| commit | 90f658c460736462d8955c0be7e4c0fa57097586 (patch) | |
| tree | 3e9f1a7178c76fe6077dc58e377e4854b4d4d810 /NetworkPkg/HttpDxe | |
| parent | 003f3c00d819e3a072133e0dbb7ca896cc87871b (diff) | |
| download | edk2-platforms-90f658c460736462d8955c0be7e4c0fa57097586.tar.xz | |
NetworkPkg: Use Http11 definitions in HttpDxe and HttpBootDxe
Change HttpDxe and HttpBootDxe to use the standard definitions from
Http11.h instead of private duplicate definitions.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Diffstat (limited to 'NetworkPkg/HttpDxe')
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpDriver.h | 2 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpImpl.h | 10 | ||||
| -rw-r--r-- | NetworkPkg/HttpDxe/HttpProto.c | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/NetworkPkg/HttpDxe/HttpDriver.h b/NetworkPkg/HttpDxe/HttpDriver.h index 138f56c9ec..9c0002abab 100644 --- a/NetworkPkg/HttpDxe/HttpDriver.h +++ b/NetworkPkg/HttpDxe/HttpDriver.h @@ -2,6 +2,7 @@ The header files of the driver binding and service binding protocol for HttpDxe driver.
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +18,7 @@ #define __EFI_HTTP_DRIVER_H__
#include <Uefi.h>
+#include <IndustryStandard/Http11.h>
//
// Libraries
diff --git a/NetworkPkg/HttpDxe/HttpImpl.h b/NetworkPkg/HttpDxe/HttpImpl.h index 38228425bb..415b5e5e95 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.h +++ b/NetworkPkg/HttpDxe/HttpImpl.h @@ -2,6 +2,7 @@ The header files of implementation of EFI_HTTP_PROTOCOL protocol interfaces.
Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+ (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -19,17 +20,10 @@ #define HTTP_DEFAULT_PORT 80
#define HTTP_END_OF_HDR_STR "\r\n\r\n"
#define HTTP_CRLF_STR "\r\n"
-#define HTTP_VERSION_STR "HTTP/1.1"
+#define HTTP_VERSION_STR HTTP_VERSION
#define HTTP_VERSION_CRLF_STR " HTTP/1.1\r\n"
-#define HTTP_GET_STR "GET "
-#define HTTP_HEAD_STR "HEAD "
#define HTTP_ERROR_OR_NOT_SUPPORT_STATUS_CODE 300
-//
-// Connect method has maximum length according to EFI_HTTP_METHOD defined in
-// UEFI2.5 spec so use this.
-//
-#define HTTP_MAXIMUM_METHOD_LEN sizeof ("CONNECT")
/**
Returns the operational parameters for the current HTTP child instance.
diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index 9660b6fb67..579b9e4662 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -2,7 +2,7 @@ Miscellaneous routines for HttpDxe driver.
Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
-(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
+(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -2023,7 +2023,7 @@ HttpGenRequestString ( //
// Calculate HTTP message length.
//
- MsgSize = Message->BodyLength + HTTP_MAXIMUM_METHOD_LEN + AsciiStrLen (Url) +
+ MsgSize = Message->BodyLength + HTTP_METHOD_MAXIMUM_LEN + AsciiStrLen (Url) +
AsciiStrLen (HTTP_VERSION_CRLF_STR) + HttpHdrSize;
Request = AllocateZeroPool (MsgSize);
if (Request == NULL) {
@@ -2036,13 +2036,13 @@ HttpGenRequestString ( //
switch (Message->Data.Request->Method) {
case HttpMethodGet:
- StrLength = sizeof (HTTP_GET_STR) - 1;
- CopyMem (RequestPtr, HTTP_GET_STR, StrLength);
+ StrLength = sizeof (HTTP_METHOD_GET) - 1;
+ CopyMem (RequestPtr, HTTP_METHOD_GET, StrLength);
RequestPtr += StrLength;
break;
case HttpMethodHead:
- StrLength = sizeof (HTTP_HEAD_STR) - 1;
- CopyMem (RequestPtr, HTTP_HEAD_STR, StrLength);
+ StrLength = sizeof (HTTP_METHOD_HEAD) - 1;
+ CopyMem (RequestPtr, HTTP_METHOD_HEAD, StrLength);
RequestPtr += StrLength;
break;
default:
@@ -2050,6 +2050,10 @@ HttpGenRequestString ( goto Exit;
}
+ StrLength = AsciiStrLen(" ");
+ CopyMem (RequestPtr, " ", StrLength);
+ RequestPtr += StrLength;
+
StrLength = AsciiStrLen (Url);
CopyMem (RequestPtr, Url, StrLength);
RequestPtr += StrLength;
|