diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:50:35 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 21:50:35 +0000 |
| commit | ec584a1b5c8d4a454a8c008492774a725f0c5513 (patch) | |
| tree | 1e78bf5fd1bb5d6c75e37395dfb8bae243c02e0f /o3d/plugin | |
| parent | 51823a97334c611dfc6ca392b2068fd3437a2478 (diff) | |
| download | chromium_src-ec584a1b5c8d4a454a8c008492774a725f0c5513.zip chromium_src-ec584a1b5c8d4a454a8c008492774a725f0c5513.tar.gz chromium_src-ec584a1b5c8d4a454a8c008492774a725f0c5513.tar.bz2 | |
Switching back SteamOperation to explicitly check for the particular protocols URLOpenStream supports. Fixes IE hang.
Review URL: http://codereview.chromium.org/149563
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/npapi_host_control/win/stream_operation.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/o3d/plugin/npapi_host_control/win/stream_operation.cc b/o3d/plugin/npapi_host_control/win/stream_operation.cc index 599c93d..a72d1a5 100644 --- a/o3d/plugin/npapi_host_control/win/stream_operation.cc +++ b/o3d/plugin/npapi_host_control/win/stream_operation.cc @@ -495,7 +495,10 @@ HRESULT StreamOperation::OpenURL(NPPluginProxy *owning_plugin, URL_COMPONENTS components = { sizeof(URL_COMPONENTS) }; if (!InternetCrackUrl(url, 0, 0, &components)) return E_INVALIDARG; - if (components.nScheme == INTERNET_SCHEME_UNKNOWN) { + if (components.nScheme != INTERNET_SCHEME_FILE && + components.nScheme != INTERNET_SCHEME_FTP && + components.nScheme != INTERNET_SCHEME_HTTP && + components.nScheme != INTERNET_SCHEME_HTTPS) { return E_INVALIDARG; } |