Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
2752da05
Commit
2752da05
authored
May 23, 2018
by
Hans Leidekker
Committed by
Alexandre Julliard
May 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winhttp: Ignore empty proxy strings read from the environment.
Signed-off-by:
Hans Leidekker
<
hans@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5bc81188
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
18 deletions
+9
-18
session.c
dlls/winhttp/session.c
+9
-18
No files found.
dlls/winhttp/session.c
View file @
2752da05
...
...
@@ -1597,29 +1597,21 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
}
if
(
!
got_from_reg
&&
(
envproxy
=
getenv
(
"http_proxy"
)))
{
char
*
colon
,
*
http_proxy
;
char
*
colon
,
*
http_proxy
=
NULL
;
if
((
colon
=
strchr
(
envproxy
,
':'
)))
if
(
!
(
colon
=
strchr
(
envproxy
,
':'
)))
http_proxy
=
envproxy
;
else
{
if
(
*
(
colon
+
1
)
==
'/'
&&
*
(
colon
+
2
)
==
'/'
)
{
static
const
char
http
[]
=
"http://"
;
/* It's a scheme, check that it's http */
if
(
!
strncmp
(
envproxy
,
http
,
strlen
(
http
)
))
http_proxy
=
envproxy
+
strlen
(
http
);
else
{
WARN
(
"unsupported scheme in $http_proxy: %s
\n
"
,
envproxy
);
http_proxy
=
NULL
;
if
(
!
strncmp
(
envproxy
,
"http://"
,
7
))
http_proxy
=
envproxy
+
7
;
else
WARN
(
"unsupported scheme in $http_proxy: %s
\n
"
,
envproxy
);
}
else
http_proxy
=
envproxy
;
}
else
http_proxy
=
envproxy
;
}
else
http_proxy
=
envproxy
;
if
(
http_proxy
)
if
(
http_proxy
&&
http_proxy
[
0
])
{
WCHAR
*
http_proxyW
;
int
len
;
...
...
@@ -1632,8 +1624,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
info
->
dwAccessType
=
WINHTTP_ACCESS_TYPE_NAMED_PROXY
;
info
->
lpszProxy
=
http_proxyW
;
info
->
lpszProxyBypass
=
NULL
;
TRACE
(
"http proxy (from environment) = %s
\n
"
,
debugstr_w
(
info
->
lpszProxy
));
TRACE
(
"http proxy (from environment) = %s
\n
"
,
debugstr_w
(
info
->
lpszProxy
));
}
}
}
...
...
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