diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index fe6f6ee18..b41fc4fe7 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -290,11 +290,11 @@ pref("browser.urlbar.matchBehavior", 1); pref("browser.urlbar.filter.javascript", true); // the maximum number of results to show in autocomplete when doing richResults -pref("browser.urlbar.maxRichResults", 12); +pref("browser.urlbar.maxRichResults", 6); // The amount of time (ms) to wait after the user has stopped typing // before starting to perform autocomplete. 50 is the default set in // autocomplete.xml. -pref("browser.urlbar.delay", 50); +pref("browser.urlbar.delay", 100); // The special characters below can be typed into the urlbar to either restrict // the search to visited history, bookmarked, tagged pages; or force a match on diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm b/media/webrtc/trunk/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm index 8e0b00273..f82437842 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm +++ b/media/webrtc/trunk/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit.mm @@ -83,7 +83,7 @@ int32_t VideoCaptureMacQTKit::Init( const int32_t nameLength = (int32_t) strlen((char*)iDeviceUniqueIdUTF8); - if(nameLength>kVideoCaptureUniqueNameLength) + if(nameLength >= kVideoCaptureUniqueNameLength) return -1; // Store the device name diff --git a/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc b/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc index 0c0b69f1c..18a0446fe 100644 --- a/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc +++ b/media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc @@ -80,7 +80,7 @@ int32_t ScreenDeviceInfoImpl::GetDeviceName(uint32_t deviceNumber, const char *deviceName = desktopDisplayDevice.getDeviceName(); len = deviceName ? strlen(deviceName) : 0; - if (len && deviceNameUTF8 && len <= deviceNameUTF8Length) { + if (len && deviceNameUTF8 && len < deviceNameUTF8Length) { memcpy(deviceNameUTF8, deviceName, len); @@ -88,7 +88,7 @@ int32_t ScreenDeviceInfoImpl::GetDeviceName(uint32_t deviceNumber, const char *deviceUniqueId = desktopDisplayDevice.getUniqueIdName(); len = deviceUniqueId ? strlen(deviceUniqueId) : 0; - if (len && deviceUniqueIdUTF8 && len <= deviceUniqueIdUTF8Length) { + if (len && deviceUniqueIdUTF8 && len < deviceUniqueIdUTF8Length) { memcpy(deviceUniqueIdUTF8, deviceUniqueId, len); @@ -174,13 +174,13 @@ int32_t AppDeviceInfoImpl::GetDeviceName(uint32_t deviceNumber, const char *deviceName = desktopApplication.getProcessAppName(); len = deviceName ? strlen(deviceName) : 0; - if (len && len <= deviceNameUTF8Length) { + if (len && len < deviceNameUTF8Length) { memcpy(deviceNameUTF8, deviceName, len); } const char *deviceUniqueId = desktopApplication.getUniqueIdName(); len = deviceUniqueId ? strlen(deviceUniqueId) : 0; - if (len && deviceUniqueIdUTF8 && len <= deviceUniqueIdUTF8Length) { + if (len && deviceUniqueIdUTF8 && len < deviceUniqueIdUTF8Length) { memcpy(deviceUniqueIdUTF8, deviceUniqueId, len); @@ -276,7 +276,7 @@ int32_t WindowDeviceInfoImpl::GetDeviceName(uint32_t deviceNumber, const char *deviceName = desktopDisplayDevice.getDeviceName(); len = deviceName ? strlen(deviceName) : 0; - if (len && deviceNameUTF8 && len <= deviceNameUTF8Length) { + if (len && deviceNameUTF8 && len < deviceNameUTF8Length) { memcpy(deviceNameUTF8, deviceName, len); @@ -284,7 +284,7 @@ int32_t WindowDeviceInfoImpl::GetDeviceName(uint32_t deviceNumber, const char *deviceUniqueId = desktopDisplayDevice.getUniqueIdName(); len = deviceUniqueId ? strlen(deviceUniqueId) : 0; - if (len && deviceUniqueIdUTF8 && len <= deviceUniqueIdUTF8Length) { + if (len && deviceUniqueIdUTF8 && len < deviceUniqueIdUTF8Length) { memcpy(deviceUniqueIdUTF8, deviceUniqueId, len); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index d87c88331..86d361f3a 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1531,12 +1531,8 @@ pref("dom.server-events.default-reconnection-time", 5000); // in milliseconds // by the jar channel. pref("network.jar.open-unsafe-types", false); // If true, loading remote JAR files using the jar: protocol will be prevented. -#ifdef RELEASE_BUILD -// Keep allowing remote JAR files for IBM iNotes (see bug 1255139) for now. +// See also bug 1255139 if you have issues with Lotus Notes. pref("network.jar.block-remote-files", false); -#else -pref("network.jar.block-remote-files", true); -#endif // This preference, if true, causes all UTF-8 domain names to be normalized to // punycode. The intention is to allow UTF-8 domain names as input, but never diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 5d94f8136..2cd57d811 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -7074,7 +7074,7 @@ org.zw // newGTLDs -// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-01-06T17:33:31Z +// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-02-01T17:46:27Z // This list is auto-generated, don't edit it manually. // aaa : 2015-02-26 American Automobile Association, Inc. aaa @@ -7376,7 +7376,7 @@ bcn // beats : 2015-05-14 Beats Electronics, LLC beats -// beauty : 2015-12-03 L'Oréal +// beauty : 2015-12-03 XYZ.COM LLC beauty // beer : 2014-01-09 Minds + Machines Group Limited @@ -7832,7 +7832,7 @@ cuisinella // cymru : 2014-05-08 Nominet UK cymru -// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd. +// cyou : 2015-01-22 ShortDot SA cyou // dabur : 2014-02-06 Dabur India Limited @@ -8399,7 +8399,7 @@ guitars // guru : 2013-08-27 Binky Moon, LLC guru -// hair : 2015-12-03 L'Oréal +// hair : 2015-12-03 XYZ.COM LLC hair // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH @@ -8918,7 +8918,7 @@ maif // maison : 2013-12-05 Binky Moon, LLC maison -// makeup : 2015-01-15 L'Oréal +// makeup : 2015-01-15 XYZ.COM LLC makeup // man : 2014-12-04 MAN SE @@ -9761,7 +9761,7 @@ site // ski : 2015-04-09 Afilias Limited ski -// skin : 2015-01-15 L'Oréal +// skin : 2015-01-15 XYZ.COM LLC skin // sky : 2014-06-19 Sky International AG @@ -10954,8 +10954,9 @@ certmgr.org xenapponazure.com // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/ -// Submitted by Rishabh Nambiar +// Submitted by Rishabh Nambiar & Michael Brown discourse.group +discourse.team // ClearVox : http://www.clearvox.nl/ // Submitted by Leon Rowland @@ -11685,6 +11686,7 @@ vologda.su // Fancy Bits, LLC : http://getchannels.com // Submitted by Aman Gupta channelsdvr.net +u.channelsdvr.net // Fastly Inc. : http://www.fastly.com/ // Submitted by Fastly Security @@ -12604,6 +12606,10 @@ pubtls.org // Submitted by Xavier De Cock qualifioapp.com +// QuickBackend: https://www.quickbackend.com +// Submitted by Dani Biro +qbuser.com + // Redstar Consultants : https://www.redstarconsultants.com/ // Submitted by Jons Slemmer instantcloud.cn @@ -12718,6 +12724,10 @@ my-firewall.org myfirewall.org spdns.org +// Senseering GmbH : https://www.senseering.de +// Submitted by Felix Mönckemeyer +senseering.net + // Service Online LLC : http://drs.ua/ // Submitted by Serhii Bulakh biz.ua @@ -12988,6 +12998,14 @@ remotewd.com // Submitted by Yuvi Panda wmflabs.org +// WoltLab GmbH : https://www.woltlab.com +// Submitted by Tim Düsterhus +myforum.community +community-pro.de +diskussionsbereich.de +community-pro.net +meinforum.net + // XenonCloud GbR: https://xenoncloud.net // Submitted by Julian Uphoff half.host diff --git a/storage/TelemetryVFS.cpp b/storage/TelemetryVFS.cpp index aad401192..74531aa11 100644 --- a/storage/TelemetryVFS.cpp +++ b/storage/TelemetryVFS.cpp @@ -279,26 +279,33 @@ DatabasePathFromWALPath(const char *zWALName) MOZ_CRASH("Should never get here!"); } -already_AddRefed -GetQuotaObjectFromNameAndParameters(const char *zName, - const char *zURIParameterKey) -{ - MOZ_ASSERT(zName); - MOZ_ASSERT(zURIParameterKey); +already_AddRefed GetQuotaObjectFromName(const char *zName, + bool deriveFromWal) { + // From Sqlite 3.31.0 the zName format changed to work consistently across + // database, wal and journal names. + // We must support both ways because this code will be uplifted to ensure + // that if system Sqlite is upgraded before us, we keep working properly. + // Once the Firefox minimum Sqlite version is 3.31.0, we can remove the else + // branch, DatabasePathFromWALPath, and the deriveFromWal argument. + const char* filename = zName; + if (deriveFromWal && sqlite3_libversion_number() < 3031000) { + filename = DatabasePathFromWALPath(zName); + } + MOZ_ASSERT(filename); const char *persistenceType = - sqlite3_uri_parameter(zURIParameterKey, "persistenceType"); + sqlite3_uri_parameter(filename, "persistenceType"); if (!persistenceType) { return nullptr; } - const char *group = sqlite3_uri_parameter(zURIParameterKey, "group"); + const char *group = sqlite3_uri_parameter(filename, "group"); if (!group) { NS_WARNING("SQLite URI had 'persistenceType' but not 'group'?!"); return nullptr; } - const char *origin = sqlite3_uri_parameter(zURIParameterKey, "origin"); + const char *origin = sqlite3_uri_parameter(filename, "origin"); if (!origin) { NS_WARNING("SQLite URI had 'persistenceType' and 'group' but not " "'origin'?!"); @@ -327,16 +334,7 @@ MaybeEstablishQuotaControl(const char *zName, return; } - MOZ_ASSERT(zName); - - const char *zURIParameterKey = (flags & SQLITE_OPEN_WAL) ? - DatabasePathFromWALPath(zName) : - zName; - - MOZ_ASSERT(zURIParameterKey); - - pFile->quotaObject = - GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey); + pFile->quotaObject = GetQuotaObjectFromName(zName, flags & SQLITE_OPEN_WAL); } /* @@ -709,10 +707,7 @@ xDelete(sqlite3_vfs* vfs, const char *zName, int syncDir) RefPtr quotaObject; if (StringEndsWith(nsDependentCString(zName), NS_LITERAL_CSTRING("-wal"))) { - const char *zURIParameterKey = DatabasePathFromWALPath(zName); - MOZ_ASSERT(zURIParameterKey); - - quotaObject = GetQuotaObjectFromNameAndParameters(zName, zURIParameterKey); + quotaObject = GetQuotaObjectFromName(zName, true); } rc = orig_vfs->xDelete(orig_vfs, zName, syncDir);