return TRUE;
default:
FIXME("unimplemented option %u\n", option);
- set_last_error( ERROR_INVALID_PARAMETER );
+ set_last_error( ERROR_WINHTTP_INVALID_OPTION );
return FALSE;
}
}
return TRUE;
default:
FIXME("unimplemented option %u\n", option);
- set_last_error( ERROR_INVALID_PARAMETER );
- return TRUE;
+ set_last_error( ERROR_WINHTTP_INVALID_OPTION );
+ return FALSE;
}
}
}
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;
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));
}
}
}
reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9
reactos/dll/win32/winemp3.acm # Synced to WineStaging-3.3
reactos/dll/win32/wing32 # Synced to WineStaging-3.3
-reactos/dll/win32/winhttp # Synced to WineStaging-3.3
+reactos/dll/win32/winhttp # Synced to WineStaging-3.9
reactos/dll/win32/wininet # Synced to WineStaging-3.3
reactos/dll/win32/winmm # Forked at Wine-20050628
reactos/dll/win32/winmm/midimap # Forked at Wine-20050628