autoland: changeset 308339:8a08c6285367caa12ac3c1ce45e1746b9ba6e1b4

author	Sylvestre Ledru <sledru@mozilla.com>
	Fri, 05 Aug 2016 18:19:44 +0200
changeset 308339	8a08c6285367caa12ac3c1ce45e1746b9ba6e1b4
parent 308338	4859180937d3826c9413378019e6d2329d9ade40
child 308340	cf64f3ec680ba27c5d158ccbbda6763dbe488634
push id	31101
push user	sledru@mozilla.com
push date	Fri, 05 Aug 2016 16:21:47 +0000
treeherder	autoland@8a08c6285367 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bsmedberg
bugs	1291738
milestone	51.0a1
first release with	nightly linux32 d42aacfe34af / 51.0a1 / 20160807030201 / files nightly linux64 d42aacfe34af / 51.0a1 / 20160807030201 / files nightly mac d42aacfe34af / 51.0a1 / 20160807030201 / files nightly win32 d42aacfe34af / 51.0a1 / 20160807030201 / files nightly win64 d42aacfe34af / 51.0a1 / 20160807030201 / files
last release without	nightly linux32 d320ef56876f / 51.0a1 / 20160805030444 / files nightly linux64 d320ef56876f / 51.0a1 / 20160805030444 / files nightly mac d320ef56876f / 51.0a1 / 20160805030444 / files nightly win32 d320ef56876f / 51.0a1 / 20160805030444 / files nightly win64 d320ef56876f / 51.0a1 / 20160805030444 / files

--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -215,16 +215,19 @@ static DllBlockInfo sWindowsDllBlocklist
   { "opls64.dll", ALL_VERSIONS },
   { "pmls.dll", ALL_VERSIONS },
   { "pmls64.dll", ALL_VERSIONS },
   { "prls.dll", ALL_VERSIONS },
   { "prls64.dll", ALL_VERSIONS },
   { "rlls.dll", ALL_VERSIONS },
   { "rlls64.dll", ALL_VERSIONS },
 
+  // Websense is crashing us on 48 & 49, bug 1291738
+  { "qipcap.dll", MAKE_VERSION(7, 6, 818, 1) },
+
   { nullptr, 0 }
 };
 
 #ifndef STATUS_DLL_NOT_FOUND
 #define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135L)
 #endif
 
 // define this for very verbose dll load debug spew