Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
0e103a39
Commit
0e103a39
authored
Sep 21, 2018
by
Nathaniel Wesley Filardo
Committed by
Marcel Stör
Sep 21, 2018
Browse files
Better fix for HTTP header decode (#2491)
See
https://github.com/nodemcu/nodemcu-firmware/issues/2482
parent
21b77bd6
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/http/httpclient.c
View file @
0e103a39
...
...
@@ -210,7 +210,7 @@ static void ICACHE_FLASH_ATTR http_connect_callback( void * arg )
char
ua_header
[
32
]
=
""
;
int
ua_len
=
0
;
if
(
os_strstr
(
req
->
headers
,
"User-Agent:"
)
==
NULL
&&
os_str
str
(
req
->
headers
,
"
u
ser-
a
gent:"
)
==
NULL
)
if
(
strcase
str
(
req
->
headers
,
"
U
ser-
A
gent:"
)
==
NULL
)
{
os_sprintf
(
ua_header
,
"User-Agent: %s
\r\n
"
,
"ESP8266"
);
ua_len
=
strlen
(
ua_header
);
...
...
@@ -218,7 +218,7 @@ static void ICACHE_FLASH_ATTR http_connect_callback( void * arg )
char
*
host_header
=
""
;
int
host_len
=
0
;
if
(
os_strstr
(
req
->
headers
,
"Host:"
)
==
NULL
&&
os_str
str
(
req
->
headers
,
"
h
ost:"
)
==
NULL
)
if
(
strcase
str
(
req
->
headers
,
"
H
ost:"
)
==
NULL
)
{
int
max_header_len
=
9
+
strlen
(
req
->
hostname
);
// 9 is fixed size of "Host:[space][cr][lf]\0"
if
((
req
->
port
==
80
)
...
...
@@ -328,10 +328,7 @@ static void ICACHE_FLASH_ATTR http_disconnect_callback( void * arg )
{
http_status
=
atoi
(
req
->
buffer
+
strlen
(
version_1_0
)
);
char
*
locationOffset
=
(
char
*
)
os_strstr
(
req
->
buffer
,
"Location:"
);
if
(
locationOffset
==
NULL
)
{
locationOffset
=
(
char
*
)
os_strstr
(
req
->
buffer
,
"location:"
);
}
char
*
locationOffset
=
(
char
*
)
strcasestr
(
req
->
buffer
,
"Location:"
);
if
(
locationOffset
!=
NULL
&&
http_status
>=
300
&&
http_status
<=
308
)
{
if
(
req
->
redirect_follow_count
<
REDIRECTION_FOLLOW_MAX
)
{
...
...
@@ -414,7 +411,7 @@ static void ICACHE_FLASH_ATTR http_disconnect_callback( void * arg )
body
=
body
+
4
;
}
if
(
os_strstr
(
req
->
buffer
,
"Transfer-Encoding: chunked"
)
||
os_str
str
(
req
->
buffer
,
"
t
ransfer-
e
ncoding: chunked"
)
)
if
(
strcase
str
(
req
->
buffer
,
"
T
ransfer-
E
ncoding: chunked"
)
)
{
int
body_size
=
req
->
buffer_size
-
(
body
-
req
->
buffer
);
char
chunked_decode_buffer
[
body_size
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment