Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
57955c73
Commit
57955c73
authored
Aug 09, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Aug 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winhttp: Allow custom headers to be separated by any sequence of \r and \n.
This fixes connecting to multiplayer game servers in Riptide GP: Renegade.
parent
cba0d5c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
28 deletions
+13
-28
request.c
dlls/winhttp/request.c
+7
-19
winhttp.c
dlls/winhttp/tests/winhttp.c
+6
-9
No files found.
dlls/winhttp/request.c
View file @
57955c73
...
...
@@ -467,26 +467,14 @@ DWORD add_request_headers( struct request *request, const WCHAR *headers, DWORD
p
=
buffer
;
do
{
q
=
p
;
while
(
*
q
)
{
if
(
q
[
0
]
==
'\n'
&&
q
[
1
]
==
'\r'
)
{
q
[
0
]
=
'\r'
;
q
[
1
]
=
'\n'
;
}
if
(
q
[
0
]
==
'\r'
)
break
;
q
++
;
}
if
(
!*
p
)
break
;
if
(
*
q
==
'\r'
)
{
*
q
=
0
;
if
(
q
[
1
]
==
'\n'
)
q
+=
2
;
/* jump over \r\n */
else
q
++
;
/* jump over \r */
}
for
(
q
=
p
;
*
q
&&
*
q
!=
'\r'
&&
*
q
!=
'\n'
;
++
q
)
;
*
q
++
=
0
;
while
(
*
q
==
'\r'
||
*
q
==
'\n'
)
++
q
;
if
((
header
=
parse_header
(
p
)))
{
ret
=
process_header
(
request
,
header
->
field
,
header
->
value
,
flags
,
TRUE
);
...
...
dlls/winhttp/tests/winhttp.c
View file @
57955c73
...
...
@@ -2532,8 +2532,8 @@ static DWORD CALLBACK server_thread(LPVOID param)
if
(
strstr
(
buffer
,
"POST /bad_headers"
))
{
ok
(
!!
strstr
(
buffer
,
"Content-Type: text/html
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
todo_wine
ok
(
!!
strstr
(
buffer
,
"Test1: Value1
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
todo_wine
ok
(
!!
strstr
(
buffer
,
"Test2: Value2
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
ok
(
!!
strstr
(
buffer
,
"Test1: Value1
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
ok
(
!!
strstr
(
buffer
,
"Test2: Value2
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
ok
(
!!
strstr
(
buffer
,
"Test3: Value3
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
ok
(
!!
strstr
(
buffer
,
"Test4: Value4
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
ok
(
!!
strstr
(
buffer
,
"Test5: Value5
\r\n
"
),
"Header missing from request %s.
\n
"
,
debugstr_a
(
buffer
));
...
...
@@ -3654,13 +3654,10 @@ static void test_bad_header( int port )
len
=
sizeof
(
buffer
);
ret
=
WinHttpQueryHeaders
(
req
,
WINHTTP_QUERY_CUSTOM
|
WINHTTP_QUERY_FLAG_REQUEST_HEADERS
,
header_tests
[
i
].
header
,
buffer
,
&
len
,
&
index
);
todo_wine_if
(
i
>=
1
&&
i
<=
3
)
{
ok
(
ret
,
"header %s: failed to query headers %lu
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
GetLastError
()
);
ok
(
!
wcscmp
(
buffer
,
header_tests
[
i
].
value
),
"header %s: got %s
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
debugstr_w
(
buffer
)
);
ok
(
index
==
1
,
"header %s: index = %lu
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
index
);
}
ok
(
ret
,
"header %s: failed to query headers %lu
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
GetLastError
()
);
ok
(
!
wcscmp
(
buffer
,
header_tests
[
i
].
value
),
"header %s: got %s
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
debugstr_w
(
buffer
)
);
ok
(
index
==
1
,
"header %s: index = %lu
\n
"
,
debugstr_w
(
header_tests
[
i
].
header
),
index
);
}
ret
=
WinHttpSendRequest
(
req
,
L"Test5: Value5
\r
Test6: Value6"
,
~
0u
,
NULL
,
0
,
0
,
0
);
...
...
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