From 83006f6e239d4bdf281a319cc036a19163aa4b55 Mon Sep 17 00:00:00 2001 From: "cbiesinger@gmx.at" Date: Tue, 21 Aug 2007 10:14:47 -0700 Subject: [PATCH 001/368] 392428 always consider IP addresses valid hostnames r+sr+a=bz --- netwerk/base/src/nsURLHelper.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/netwerk/base/src/nsURLHelper.cpp b/netwerk/base/src/nsURLHelper.cpp index a906eb5ad088..6f962c4a5045 100644 --- a/netwerk/base/src/nsURLHelper.cpp +++ b/netwerk/base/src/nsURLHelper.cpp @@ -50,6 +50,7 @@ #include "nsNetCID.h" #include "netCore.h" #include "prprf.h" +#include "prnetdb.h" //---------------------------------------------------------------------------- // Init/Shutdown @@ -887,12 +888,18 @@ net_IsValidHostName(const nsCSubstring &host) const char *end = host.EndReading(); // ctrl-chars and !\"#%&'()*,/;<=>?@\\^{|}\x7f // if one of these chars is found return false - return net_FindCharInSet(host.BeginReading(), end, - "\x01\x02\x03\x04\x05\x06\x07\x08" - "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" - "\x11\x12\x13\x14\x15\x16\x17\x18" - "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20" - "\x21\x22\x23\x25\x26\x27\x28\x29" - "\x2a\x2c\x2f\x3b\x3c\x3d\x3e" - "\x3f\x40\x5c\x5e\x7b\x7c\x7e\x7f") == end; + if (net_FindCharInSet(host.BeginReading(), end, + "\x01\x02\x03\x04\x05\x06\x07\x08" + "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" + "\x11\x12\x13\x14\x15\x16\x17\x18" + "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20" + "\x21\x22\x23\x25\x26\x27\x28\x29" + "\x2a\x2c\x2f\x3b\x3c\x3d\x3e" + "\x3f\x40\x5c\x5e\x7b\x7c\x7e\x7f") == end) + return PR_TRUE; + + // Might be a valid IPv6 link-local address containing a percent sign + nsCAutoString strhost(host); + PRNetAddr addr; + return PR_StringToNetAddr(strhost.get(), &addr) == PR_SUCCESS; } From 30d7fb302b33509f0f45e76ebb30d74f3301cc5f Mon Sep 17 00:00:00 2001 From: "sdwilsh@shawnwilsher.com" Date: Tue, 21 Aug 2007 10:22:02 -0700 Subject: [PATCH 002/368] Bug 308073 - Change default downloading folder in Windows Vista from Desktop to Downloads. Patch by Jim Mathies . r=robarnold, r=robert.bugzilla, sr=dougt, a=mconnor --- browser/base/content/browser.js | 19 ++ .../migration/src/nsOperaProfileMigrator.cpp | 2 +- .../migration/src/nsSafariProfileMigrator.cpp | 2 +- browser/components/preferences/main.js | 262 ++++++++++-------- browser/components/preferences/main.xul | 7 +- .../preferences/preferences.properties | 2 +- .../downloads/public/nsIDownloadManager.idl | 29 +- .../downloads/src/nsDownloadManager.cpp | 177 +++++++++++- toolkit/content/contentAreaUtils.js | 96 ++----- .../mozapps/downloads/downloads.properties | 3 + .../downloads/unknownContentType.properties | 1 - .../downloads/src/nsHelperAppDlg.js.in | 174 +++++------- xpcom/io/SpecialSystemDirectory.cpp | 20 +- 13 files changed, 488 insertions(+), 306 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 57eaded043d2..4059e59f73b7 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1114,6 +1114,25 @@ function delayedStartup() Components.utils.reportError("Failed to init content pref service:\n" + ex); } +#ifdef XP_WIN + // For Vista, flip the default download folder pref once from Desktop to Downloads + // on new profiles. + try { + var sysInfo = Cc["@mozilla.org/system-info;1"]. + getService(Ci.nsIPropertyBag2); + if (parseFloat(sysInfo.getProperty("version")) >= 6 && + !gPrefService.getPrefType("browser.download.dir") && + gPrefService.getIntPref("browser.download.folderList") == 0) { + var dnldMgr = Cc["@mozilla.org/download-manager;1"] + .getService(Ci.nsIDownloadManager); + gPrefService.setCharPref("browser.download.dir", + dnldMgr.defaultDownloadsDirectory.path); + gPrefService.setIntPref("browser.download.folderList", 1); + } + } catch (ex) { + } +#endif + // initialize the session-restore service (in case it's not already running) if (document.documentElement.getAttribute("windowtype") == "navigator:browser") { try { diff --git a/browser/components/migration/src/nsOperaProfileMigrator.cpp b/browser/components/migration/src/nsOperaProfileMigrator.cpp index 9e992e78ec72..bc01b46c0947 100644 --- a/browser/components/migration/src/nsOperaProfileMigrator.cpp +++ b/browser/components/migration/src/nsOperaProfileMigrator.cpp @@ -314,7 +314,7 @@ nsOperaProfileMigrator::GetSourceHomePageURL(nsACString& aResult) static nsOperaProfileMigrator::PrefTransform gTransforms[] = { - { "User Prefs", "Download Directory", _OPM(STRING), "browser.download.defaultFolder", _OPM(SetFile), PR_FALSE, -1 }, + { "User Prefs", "Download Directory", _OPM(STRING), "browser.download.dir", _OPM(SetFile), PR_FALSE, -1 }, { nsnull, "Enable Cookies", _OPM(INT), "network.cookie.cookieBehavior", _OPM(SetCookieBehavior), PR_FALSE, -1 }, { nsnull, "Accept Cookies Session Only", _OPM(BOOL), "network.cookie.enableForCurrentSessionOnly", _OPM(SetBool), PR_FALSE, -1 }, { nsnull, "Allow script to resize window", _OPM(BOOL), "dom.disable_window_move_resize", _OPM(SetBool), PR_FALSE, -1 }, diff --git a/browser/components/migration/src/nsSafariProfileMigrator.cpp b/browser/components/migration/src/nsSafariProfileMigrator.cpp index 59a1dbcc7ed8..d647352ddf05 100644 --- a/browser/components/migration/src/nsSafariProfileMigrator.cpp +++ b/browser/components/migration/src/nsSafariProfileMigrator.cpp @@ -516,7 +516,7 @@ nsSafariProfileMigrator::SetDownloadFolder(void* aTransform, nsIPrefBranch* aBra PRBool equals; downloadFolder->Equals(desktopFolder, &equals); aBranch->SetIntPref("browser.download.folderList", equals ? 0 : 2); - aBranch->SetComplexValue("browser.download.defaultFolder", + aBranch->SetComplexValue("browser.download.dir", NS_GET_IID(nsILocalFile), downloadFolder); return NS_OK; diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index 10a92f827cc1..273c84bdc469 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -171,26 +171,35 @@ var gMainPane = { /* * Preferences: * - * browser.download.showWhenStarting - * true if the Download Manager should be opened when a download is started, - * false if it shouldn't be opened - * browser.download.closeWhenDone - * true if the Download Manager should be closed when all downloads - * complete, false if it shouldn't be closed - * browser.download.useDownloadDir - * true if downloads are saved to a default location with no UI shown, false - * if the user should always be asked where to save files - * browser.download.dir - * the last directory to which a download was saved + * browser.download.showWhenStarting - bool + * True if the Download Manager should be opened when a download is + * started, false if it shouldn't be opened. + * browser.download.closeWhenDone - bool + * True if the Download Manager should be closed when all downloads + * complete, false if it should be left open. + * browser.download.useDownloadDir - bool + * True if downloads are saved with no save-as UI shown, false if + * the user should always be asked where to save a file. + * browser.download.dir - str path + * A local path the user may have selected for downloaded files to be + * saved. Migration of other browser settings may also set this path. + * This path is enabled when folderList is equals 2. + * browser.download.lastDir - str path + * May contain the last folder path accessed when the user browsed + * via the file save-as dialog. (see contentAreaUtils.js) + * browser.download.folderList - int + * Indicates the location users wish to save downloaded files too. + * It is also used to display special file labels when the default + * download location is either the Desktop or the Downloads folder. + * Values: + * 0 - The desktop is the default download location. + * 1 - The system's downloads folder is the default download location. + * 2 - The default download location is elsewhere as specified in + * browser.download.dir. * browser.download.downloadDir - * the current default download location - * browser.download.folderList - * 0 if the desktop is the default download location, - * 1 if the downloads folder is the default download location, - * 2 if the default download location is elsewhere; - * used to display special UI when the default location is the Desktop or - * the Downloads folder in Download Manager UI and in the file field in - * preferences + * depreciated. + * browser.download.defaultFolder + * depreciated. */ /** @@ -232,7 +241,7 @@ var gMainPane = { // don't override the preference's value in UI return undefined; }, - + /** * Displays a file picker in which the user can choose the location where * downloads are automatically saved, updating preferences and UI in @@ -241,58 +250,139 @@ var gMainPane = { chooseFolder: function () { const nsIFilePicker = Components.interfaces.nsIFilePicker; + const nsILocalFile = Components.interfaces.nsILocalFile; + var fp = Components.classes["@mozilla.org/filepicker;1"] .createInstance(nsIFilePicker); var bundlePreferences = document.getElementById("bundlePreferences"); var title = bundlePreferences.getString("chooseDownloadFolderTitle"); fp.init(window, title, nsIFilePicker.modeGetFolder); - - const nsILocalFile = Components.interfaces.nsILocalFile; - var customDirPref = document.getElementById("browser.download.dir"); - if (customDirPref.value) - fp.displayDirectory = customDirPref.value; fp.appendFilters(nsIFilePicker.filterAll); + + var folderListPref = document.getElementById("browser.download.folderList"); + var currentDirPref = this._indexToFolder(folderListPref.value); // file + var defDownloads = this._indexToFolder(1); // file + + // First try to open what's currently configured + if (currentDirPref && currentDirPref.exists()) { + fp.displayDirectory = currentDirPref; + } // Try the system's download dir + else if (defDownloads && defDownloads.exists()) { + fp.displayDirectory = defDownloads; + } // Fall back to Desktop + else { + fp.displayDirectory = this._indexToFolder(0); + } + if (fp.show() == nsIFilePicker.returnOK) { var file = fp.file.QueryInterface(nsILocalFile); - var currentDirPref = document.getElementById("browser.download.downloadDir"); - customDirPref.value = currentDirPref.value = file; + var currentDirPref = document.getElementById("browser.download.dir"); + currentDirPref.value = file; var folderListPref = document.getElementById("browser.download.folderList"); folderListPref.value = this._folderToIndex(file); + // Note, the real prefs will not be updated yet, so dnld manager's + // userDownloadsDirectory may not return the right folder after + // this code executes. displayDownloadDirPref will be called on + // the assignment above to update the UI. } }, /** - * Initializes the download folder widget based on the folder as stored in + * Initializes the download folder display settings based on the user's * preferences. */ - readDownloadDirPref: function () + displayDownloadDirPref: function () { var folderListPref = document.getElementById("browser.download.folderList"); var bundlePreferences = document.getElementById("bundlePreferences"); var downloadFolder = document.getElementById("downloadFolder"); + var currentDirPref = document.getElementById("browser.download.dir"); - var customDirPref = document.getElementById("browser.download.dir"); - var customIndex = customDirPref.value ? this._folderToIndex(customDirPref.value) : 0; - if (folderListPref.value == 0 || customIndex == 0) - downloadFolder.label = bundlePreferences.getString("desktopFolderName"); - else if (folderListPref.value == 1 || customIndex == 1) - downloadFolder.label = bundlePreferences.getString("myDownloadsFolderName"); - else - downloadFolder.label = this._getDisplayNameOfFile(customDirPref.value); + // The user's download folder is based on the preferences listed above. + // However, if the system does not support a download folder, the + // actual path returned will be the system's desktop or home folder. + // If this is the case, skip off displaying the Download label and + // display Desktop, even though folderList might be 1. + var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"] + .getService(Components.interfaces.nsIProperties); + var desk = fileLocator.get("Desk", Components.interfaces.nsILocalFile); + var dnldMgr = Components.classes["@mozilla.org/download-manager;1"] + .getService(Components.interfaces.nsIDownloadManager); + var supportDownloadLabel = !dnldMgr.defaultDownloadsDirectory.equals(desk); + // Used in defining the correct path to the folder icon. var ios = Components.classes["@mozilla.org/network/io-service;1"] .getService(Components.interfaces.nsIIOService); var fph = ios.getProtocolHandler("file") .QueryInterface(Components.interfaces.nsIFileProtocolHandler); - var currentDirPref = document.getElementById("browser.download.downloadDir"); - var downloadDir = currentDirPref.value || this._indexToFolder(folderListPref.value); - var urlspec = fph.getURLSpecFromFile(downloadDir); - downloadFolder.image = "moz-icon://" + urlspec + "?size=16"; - + var iconUrlSpec; + + // Display a 'pretty' label or the path in the UI. + if (folderListPref.value == 2) { + // Custom path selected and is configured + downloadFolder.label = this._getDisplayNameOfFile(currentDirPref.value); + iconUrlSpec = fph.getURLSpecFromFile(currentDirPref.value); + } else if (folderListPref.value == 1 && supportDownloadLabel) { + // 'Downloads' + // In 1.5, this pointed to a folder we created called 'My Downloads' + // and was available as an option in the 1.5 drop down. On XP this + // was in My Documents, on OSX it was in User Docs. In 2.0, we did + // away with the drop down option, although the special label was + // still supported for the folder if it existed. Because it was + // not exposed it was rarely used. + // With 3.0, a new desktop folder - 'Downloads' was introduced for + // platforms and versions that don't support a default system downloads + // folder. See nsDownloadManager for details. + downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); + } else { + // 'Desktop' + downloadFolder.label = bundlePreferences.getString("desktopFolderName"); + iconUrlSpec = fph.getURLSpecFromFile(desk); + } + downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; + // don't override the preference's value in UI return undefined; }, + /** + * Returns the textual path of a folder in readable form. + */ + _getDisplayNameOfFile: function (aFolder) + { + // TODO: would like to add support for 'Downloads on Macintosh HD' + // for OS X users. + return aFolder ? aFolder.path : ""; + }, + + /** + * Returns the Downloads folder. If aFolder is "Desktop", then the Downloads + * folder returned is the desktop folder; otherwise, it is a folder whose name + * indicates that it is a download folder and whose path is as determined by + * the XPCOM directory service via the download manager's attribute + * defaultDownloadsDirectory. + * + * @throws if aFolder is not "Desktop" or "Downloads" + */ + _getDownloadsFolder: function (aFolder) + { + switch(aFolder) + { + case "Desktop": + var fileLoc = Components.classes["@mozilla.org/file/directory_service;1"] + .getService(Components.interfaces.nsIProperties); + return fileLoc.get("Desk", Components.interfaces.nsILocalFile); + break; + case "Downloads": + var dnldMgr = Components.classes["@mozilla.org/download-manager;1"] + .getService(Components.interfaces.nsIDownloadManager); + return dnldMgr.defaultDownloadsDirectory; + break; + } + throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'"; + }, + /** * Determines the type of the given folder. * @@ -312,64 +402,6 @@ var gMainPane = { return 2; }, - /** - * Returns the Downloads folder. If aFolder is "Desktop", then the Downloads - * folder returned is the desktop folder; otherwise, it is a folder whose name - * indicates that it is a download folder and whose path is as determined by - * the XPCOM directory service from aFolder. - * - * @throws if aFolder is not "Desktop" or "Downloads" - */ - _getDownloadsFolder: function (aFolder) - { - var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"] - .getService(Components.interfaces.nsIProperties); - var dir = fileLocator.get(this._getSpecialFolderKey(aFolder), - Components.interfaces.nsILocalFile); - if (aFolder != "Desktop") - dir.append("My Downloads"); // XXX l12y! - - return dir; - }, - - /** - * Gets the platform-specific key to be fed to the directory service for the - * given special folder. - * - * @param aFolder - * either of the strings "Desktop" or "Downloads" - * @returns the platform-specific key for the location, which may be used with - * the XPCOM directory service - */ - _getSpecialFolderKey: function (aFolderType) - { - if (aFolderType == "Desktop") - return "Desk"; - - if (aFolderType == "Downloads") -#ifdef XP_WIN - return "Pers"; -#else -#ifdef XP_MACOSX - return "UsrDocs"; -#else - return "Home"; -#endif -#endif - - throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'"; - }, - - /** - * Returns the textual path of a folder in readable form. - */ - _getDisplayNameOfFile: function (aFolder) - { - // TODO: would like to add support for 'Downloads on Macintosh HD' - // for OS X users. - return aFolder ? aFolder.path : ""; - }, - /** * Converts an integer into the corresponding folder. * @@ -377,7 +409,7 @@ var gMainPane = { * an integer * @returns the Desktop folder if aIndex == 0, * the Downloads folder if aIndex == 1, - * the folder stored in browser.download.dir otherwise + * the folder stored in browser.download.dir */ _indexToFolder: function (aIndex) { @@ -387,19 +419,31 @@ var gMainPane = { case 1: return this._getDownloadsFolder("Downloads"); } - - var customDirPref = document.getElementById("browser.download.dir"); - return customDirPref.value; + var currentDirPref = document.getElementById("browser.download.dir"); + return currentDirPref.value; }, /** - * Returns the value for the browser.download.folderList preference determined - * from the current value of browser.download.downloadDir. + * Returns the value for the browser.download.folderList preference. */ - writeFolderList: function () + getFolderListPref: function () { - var currentDirPref = document.getElementById("browser.download.downloadDir"); - return this._folderToIndex(currentDirPref.value); + var folderListPref = document.getElementById("browser.download.folderList"); + switch(folderListPref.value) { + case 0: // Desktop + case 1: // Downloads + return folderListPref.value; + break; + case 2: // Custom + var currentDirPref = document.getElementById("browser.download.dir"); + if (currentDirPref.value) { + // Resolve to a known location if possible. We are writing out + // to prefs on this call, so now would be a good time to do it. + return this._folderToIndex(currentDirPref.value); + } + return 0; + break; + } } #ifdef HAVE_SHELL_SERVICE diff --git a/browser/components/preferences/main.xul b/browser/components/preferences/main.xul index 9889c86fe149..f0674fc9d529 100644 --- a/browser/components/preferences/main.xul +++ b/browser/components/preferences/main.xul @@ -91,7 +91,6 @@ name="browser.download.dir" type="file" onchange="gMainPane.readDownloadDirPref();"/> - @@ -177,8 +176,8 @@ + onsyncfrompreference="return gMainPane.displayDownloadDirPref();" + onsynctopreference="return gMainPane.getFolderListPref()"/> + + + + + +
+
+
+ + + From 4c679bec9afe0263aec2f975d2c88271c3bf248f Mon Sep 17 00:00:00 2001 From: "rob_strong@exchangecode.com" Date: Thu, 23 Aug 2007 12:39:50 -0700 Subject: [PATCH 349/368] Bug 392303 - Simplify installer changes (fix includes for older versions of NSIS). r=sspitzer --- toolkit/mozapps/installer/windows/nsis/common.nsh | 14 +++++++++----- .../mozapps/installer/windows/nsis/overrides.nsh | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 1a6a37213722..009b42f4eafd 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -67,11 +67,15 @@ Exch 1 ; exchange the top of the stack with 2 below the top of the stack Exch $R9 ; exchange the new $R9 value with the top of the stack */ -# Commented out until the Thunderbird, Seamonkey, and Calendar Tinderboxes -# have been updated to MozillaBuild which includes an updated version of -# NSIS -# !include TextFunc.nsh -# !include FileFunc.nsh +; When including a file provided by NSIS check if its verbose macro is defined +; to prevent loading the file a second time. +!ifmacrondef TEXTFUNC_VERBOSE +!include TextFunc.nsh +!endif + +!ifmacrondef FILEFUNC_VERBOSE +!include FileFunc.nsh +!endif ; NSIS provided macros that we have overridden. !include overrides.nsh diff --git a/toolkit/mozapps/installer/windows/nsis/overrides.nsh b/toolkit/mozapps/installer/windows/nsis/overrides.nsh index a3bf09006d5c..899e71dae616 100755 --- a/toolkit/mozapps/installer/windows/nsis/overrides.nsh +++ b/toolkit/mozapps/installer/windows/nsis/overrides.nsh @@ -4,11 +4,15 @@ !ifndef OVERRIDES_INCLUDED !define OVERRIDES_INCLUDED -# Commented out until the Thunderbird, Seamonkey, and Calendar Tinderboxes -# have been updated to MozillaBuild which includes an updated version of -# NSIS -# !include TextFunc.nsh -# !include FileFunc.nsh +; When including a file check if its verbose macro is defined to prevent +; loading the file a second time. +!ifmacrondef TEXTFUNC_VERBOSE +!include TextFunc.nsh +!endif + +!ifmacrondef FILEFUNC_VERBOSE +!include FileFunc.nsh +!endif ; Modified version of Locate from the NSIS File Functions Header v3.2 ; This version has the calls to SetDetailsPrint and DetailsPrint commented out. From 1818d421063a08aa237f1e35ffc25f8802ac801f Mon Sep 17 00:00:00 2001 From: "dolske@mozilla.com" Date: Thu, 23 Aug 2007 13:06:40 -0700 Subject: [PATCH 350/368] bustage fix until I figure out how to make test work on Linux. --- .../passwordmgr/test/test_basic_form_autocomplete.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html index 633f1a729fea..5cc543542cff 100644 --- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html +++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html @@ -287,6 +287,9 @@ function runTest(testNum) { doKey("return"); checkForm("zzzuser4", "zzzpass4"); +// XXX temp bandaid: bail out now to avoid linux test failure. +SimpleTest.finish(); +return; // Trigger autocomplete popup restoreForm(); doKey("down"); From bf3473667f40cea56408808262e411b5a7275b9f Mon Sep 17 00:00:00 2001 From: "kaie@kuix.de" Date: Thu, 23 Aug 2007 13:13:50 -0700 Subject: [PATCH 351/368] bug 386654, Implement notification for EV certs r=rrelyea, sr=bzbarsky, a=bzbarsky --- uriloader/base/nsIWebProgressListener.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/uriloader/base/nsIWebProgressListener.idl b/uriloader/base/nsIWebProgressListener.idl index 169ae7d1d9d3..5c9f9673d783 100644 --- a/uriloader/base/nsIWebProgressListener.idl +++ b/uriloader/base/nsIWebProgressListener.idl @@ -230,6 +230,18 @@ interface nsIWebProgressListener : nsISupports const unsigned long STATE_SECURE_MED = 0x00010000; const unsigned long STATE_SECURE_LOW = 0x00020000; + /** + * State bits for EV == Extended Validation == High Assurance + * + * These flags describe the level of identity verification + * in a call to the onSecurityChange method. + * + * STATE_IDENTITY_EV_TOPLEVEL + * The topmost document uses an EV cert. + * NOTE: Available since Gecko 1.9 + */ + + const unsigned long STATE_IDENTITY_EV_TOPLEVEL = 0x00100000; /** * Notification indicating the state has changed for one of the requests From 231b5fb55db55931f8ec0bf17526a9686ba3bde8 Mon Sep 17 00:00:00 2001 From: "rob_strong@exchangecode.com" Date: Thu, 23 Aug 2007 14:13:47 -0700 Subject: [PATCH 352/368] backing out code that snuck in from bug 392303 --- .../mozapps/installer/windows/nsis/common.nsh | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 009b42f4eafd..050148ef14ad 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -401,60 +401,6 @@ Exch $R9 ; exchange the new $R9 value with the top of the stack WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Bottom "117" !macroend -!macro createSummaryINI - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "5" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Text "$(OPTIONAL_COMPONENTS_LABEL)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Bottom "15" - - StrCpy $R1 2 - ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Type "checkbox" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Text "$(DOMI_TITLE)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Left "15" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Top "20" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Bottom "30" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" State "1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Flags "GROUP" - IntOp $R1 $R1 + 1 - ${EndIf} - - ${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Type "checkbox" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Text "$(QFA_TITLE)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Left "15" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Top "55" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Bottom "65" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" State "1" - IntOp $R1 $R1 + 1 - ${EndIf} - - ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Text "$(DOMI_TEXT)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Left "30" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Top "32" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Bottom "52" - IntOp $R1 $R1 + 1 - ${EndIf} - - ${If} ${FileExists} "$EXEDIR\optional\extensions\talkback@mozilla.org" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Text "$(QFA_TEXT)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Left "30" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Top "67" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $R1" Bottom "87" - ${EndIf} -!macroend - !macro GetParentDir Exch $R0 Push $R1 From df38cd6ea9e79735c4bcde9fb26032da38000a10 Mon Sep 17 00:00:00 2001 From: "enndeakin@sympatico.ca" Date: Thu, 23 Aug 2007 14:21:27 -0700 Subject: [PATCH 353/368] Bug 392314, alt key should close menu, add some key closing menus tests, r+sr=bz,a=dbaron --- layout/xul/base/src/nsMenuBarFrame.cpp | 2 + layout/xul/base/src/nsXULPopupManager.cpp | 18 +++++-- .../content/tests/widgets/window_menubar.xul | 48 ++++++++++++++++++- 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/layout/xul/base/src/nsMenuBarFrame.cpp b/layout/xul/base/src/nsMenuBarFrame.cpp index 15df2a0a7d62..e57d316839bb 100644 --- a/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/layout/xul/base/src/nsMenuBarFrame.cpp @@ -255,6 +255,8 @@ nsMenuBarFrame::FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent) { PRUint32 charCode; aKeyEvent->GetCharCode(&charCode); + if (!charCode) // no character was pressed so just return + return nsnull; // Enumerate over our list of frames. nsIFrame* immediateParent = nsnull; diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp index c4e5e6187928..6877e9c1b1e5 100644 --- a/layout/xul/base/src/nsXULPopupManager.cpp +++ b/layout/xul/base/src/nsXULPopupManager.cpp @@ -1604,8 +1604,10 @@ nsXULPopupManager::IsValidMenuItem(nsPresContext* aPresContext, nsresult nsXULPopupManager::KeyUp(nsIDOMEvent* aKeyEvent) { - aKeyEvent->StopPropagation(); - aKeyEvent->PreventDefault(); + if (mCurrentMenu) { + aKeyEvent->StopPropagation(); + aKeyEvent->PreventDefault(); + } return NS_OK; // I am consuming event } @@ -1613,6 +1615,10 @@ nsXULPopupManager::KeyUp(nsIDOMEvent* aKeyEvent) nsresult nsXULPopupManager::KeyDown(nsIDOMEvent* aKeyEvent) { + // don't do anything if a menu isn't open + if (!mCurrentMenu) + return NS_OK; + PRInt32 menuAccessKey = -1; // If the key just pressed is the access key (usually Alt), @@ -1726,8 +1732,12 @@ nsXULPopupManager::KeyPress(nsIDOMEvent* aKeyEvent) HandleShortcutNavigation(keyEvent, nsnull); } - aKeyEvent->StopPropagation(); - aKeyEvent->PreventDefault(); + if (mCurrentMenu) { + // if a menu is open, it consumes the key event + aKeyEvent->StopPropagation(); + aKeyEvent->PreventDefault(); + } + return NS_OK; // I am consuming event } diff --git a/toolkit/content/tests/widgets/window_menubar.xul b/toolkit/content/tests/widgets/window_menubar.xul index 6b163ebd0a93..1f884e0d1b3e 100644 --- a/toolkit/content/tests/widgets/window_menubar.xul +++ b/toolkit/content/tests/widgets/window_menubar.xul @@ -1,8 +1,11 @@ + + @@ -492,6 +495,49 @@ var popupTests = [ checkClosed("editmenu", testname); } }, +{ + testname: "F10 to activate menubar for tab deactivation", + events: [ "DOMMenuBarActive menubar", "DOMMenuItemActive filemenu" ], + test: function() { synthesizeKey("VK_F10", { }); }, +}, +{ + testname: "Deactivate menubar with tab key", + events: [ "DOMMenuBarInactive menubar", "DOMMenuItemInactive filemenu" ], + test: function() { synthesizeKey("VK_TAB", { }); }, +}, +{ + testname: "F10 to activate menubar for escape deactivation", + events: [ "DOMMenuBarActive menubar", "DOMMenuItemActive filemenu" ], + test: function() { synthesizeKey("VK_F10", { }); }, +}, +{ + testname: "Deactivate menubar with escape key", + events: [ "DOMMenuBarInactive menubar", "DOMMenuItemInactive filemenu" ], + test: function() { synthesizeKey("VK_ESCAPE", { }); }, +}, +{ + testname: "F10 to activate menubar for f10 deactivation", + events: [ "DOMMenuBarActive menubar", "DOMMenuItemActive filemenu" ], + test: function() { synthesizeKey("VK_F10", { }); }, +}, +{ + testname: "Deactivate menubar with f10 key", + events: [ "DOMMenuBarInactive menubar", "DOMMenuItemInactive filemenu" ], + test: function() { synthesizeKey("VK_F10", { }); }, +}, +{ + testname: "F10 to activate menubar for alt deactivation", + condition: function() { return (navigator.platform.indexOf("Win") == 0) }, + events: [ "DOMMenuBarActive menubar", "DOMMenuItemActive filemenu" ], + test: function() { synthesizeKey("VK_F10", { }); }, +}, +{ + testname: "Deactivate menubar with alt key", + condition: function() { return (navigator.platform.indexOf("Win") == 0) }, + events: [ "DOMMenuBarInactive menubar", "DOMMenuItemInactive filemenu" ], + test: function() { synthesizeKey("VK_ALT", { }); }, +} + ]; ]]> From 777eda58b29252cc5c0ed3bbee6e5251b688d3fa Mon Sep 17 00:00:00 2001 From: "mozilla@weilbacher.org" Date: Thu, 23 Aug 2007 14:25:10 -0700 Subject: [PATCH 354/368] [OS/2] Bug 391421: fix submenu highlight offset without breaking TB folder pane, p=mz@scntt/me, r=mkaply --- widget/src/os2/nsWindow.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp index d9ea5451b659..ea33a63c3f03 100644 --- a/widget/src/os2/nsWindow.cpp +++ b/widget/src/os2/nsWindow.cpp @@ -1490,14 +1490,17 @@ NS_METHOD nsWindow::Resize(PRInt32 aX, PRInt32 h, PRBool aRepaint) { - // NS_ASSERTION((w >=0 ), "Negative width passed to nsWindow::Resize"); - // NS_ASSERTION((h >=0 ), "Negative height passed to nsWindow::Resize"); - - // Set cached value for lightweight and printing - mBounds.x = aX; - mBounds.y = aY; - mBounds.width = w; - mBounds.height = h; + // For mWnd & eWindowType_child set the cached values upfront, see bug 286555. + // For other mWnd types we defer transfer of values to mBounds to + // SetWindowPos(), see bug 391421. + if( !mWnd || mWindowType == eWindowType_child) + { + // Set cached value for lightweight and printing + mBounds.x = aX ; + mBounds.y = aY ; + mBounds.width = w ; + mBounds.height = h ; + } // WinSetWindowPos() appears not to require a msgq if( mWnd) From d9fa93d8b45faa0d33198d6856281f66ee326da5 Mon Sep 17 00:00:00 2001 From: "kaie@kuix.de" Date: Thu, 23 Aug 2007 14:28:15 -0700 Subject: [PATCH 355/368] bug 386654, Implement notification for EV certs r=rrelyea, sr=bzbarsky, a=bzbarsky --- .../boot/src/nsSecureBrowserUIImpl.cpp | 20 +++++++-- .../manager/boot/src/nsSecureBrowserUIImpl.h | 1 + security/manager/ssl/public/Makefile.in | 1 + .../manager/ssl/public/nsIIdentityInfo.idl | 44 +++++++++++++++++++ security/manager/ssl/src/Makefile.in | 1 + .../manager/ssl/src/nsIdentityChecking.cpp | 11 +++++ security/manager/ssl/src/nsNSSCallbacks.cpp | 7 ++- security/manager/ssl/src/nsNSSIOLayer.cpp | 22 +++++++++- security/manager/ssl/src/nsNSSIOLayer.h | 9 ++++ 9 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 security/manager/ssl/public/nsIIdentityInfo.idl create mode 100644 security/manager/ssl/src/nsIdentityChecking.cpp diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp index 0801f8002a6a..4dce292e2bf0 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp @@ -65,12 +65,14 @@ #include "nsPIDOMWindow.h" #include "nsIContent.h" #include "nsIWebProgress.h" +#include "nsIWebProgressListener.h" #include "nsIChannel.h" #include "nsIHttpChannel.h" #include "nsIFileChannel.h" #include "nsIWyciwygChannel.h" #include "nsIFTPChannel.h" #include "nsITransportSecurityInfo.h" +#include "nsIIdentityInfo.h" #include "nsIURI.h" #include "nsISecurityEventSink.h" #include "nsIPrompt.h" @@ -139,6 +141,7 @@ nsSecureBrowserUIImpl::nsSecureBrowserUIImpl() { mTransferringRequests.ops = nsnull; mNewToplevelSecurityState = STATE_IS_INSECURE; + mNewToplevelIsEV = PR_FALSE; mNewToplevelSecurityStateKnown = PR_TRUE; ResetStateTracking(); @@ -429,9 +432,10 @@ nsSecureBrowserUIImpl::EvaluateAndUpdateSecurityState(nsIRequest *aRequest) { nsCOMPtr channel(do_QueryInterface(aRequest)); - if (!channel) { - mNewToplevelSecurityState = nsIWebProgressListener::STATE_IS_INSECURE; - } else { + mNewToplevelSecurityState = nsIWebProgressListener::STATE_IS_INSECURE; + mNewToplevelIsEV = PR_FALSE; + + if (channel) { mNewToplevelSecurityState = GetSecurityStateFromChannel(channel); PR_LOG(gSecureDocLog, PR_LOG_DEBUG, @@ -452,6 +456,13 @@ nsSecureBrowserUIImpl::EvaluateAndUpdateSecurityState(nsIRequest *aRequest) if (secInfo) { secInfo->GetShortSecurityDescription(getter_Copies(mInfoTooltip)); } + + nsCOMPtr idinfo = do_QueryInterface(info); + if (idinfo) { + PRBool aTemp; + if (NS_SUCCEEDED(idinfo->GetIsExtendedValidation(&aTemp))) + mNewToplevelIsEV = aTemp; + } } } @@ -1139,6 +1150,9 @@ nsresult nsSecureBrowserUIImpl::UpdateSecurityState(nsIRequest* aRequest) ("SecureUI:%p: UpdateSecurityState: calling OnSecurityChange\n", this )); + if (mNewToplevelIsEV) + newState |= nsIWebProgressListener::STATE_IDENTITY_EV_TOPLEVEL; + mToplevelEventSink->OnSecurityChange(aRequest, newState); } else diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.h b/security/manager/boot/src/nsSecureBrowserUIImpl.h index 67f571cc06dd..8f81d0de8ba7 100644 --- a/security/manager/boot/src/nsSecureBrowserUIImpl.h +++ b/security/manager/boot/src/nsSecureBrowserUIImpl.h @@ -110,6 +110,7 @@ protected: void ResetStateTracking(); PRUint32 mNewToplevelSecurityState; + PRPackedBool mNewToplevelIsEV; PRPackedBool mNewToplevelSecurityStateKnown; PRPackedBool mIsViewSource; diff --git a/security/manager/ssl/public/Makefile.in b/security/manager/ssl/public/Makefile.in index 9db7f4253277..fcd4503ac466 100644 --- a/security/manager/ssl/public/Makefile.in +++ b/security/manager/ssl/public/Makefile.in @@ -57,6 +57,7 @@ SDK_XPIDLSRCS = \ nsIX509Cert.idl \ nsIX509CertDB.idl \ nsIX509CertValidity.idl \ + nsIIdentityInfo.idl \ $(NULL) XPIDLSRCS = \ diff --git a/security/manager/ssl/public/nsIIdentityInfo.idl b/security/manager/ssl/public/nsIIdentityInfo.idl new file mode 100644 index 000000000000..14a2f16dd656 --- /dev/null +++ b/security/manager/ssl/public/nsIIdentityInfo.idl @@ -0,0 +1,44 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is Google Inc. + * Portions created by the Initial Developer are Copyright (C) 2006 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Kai Engert + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsISupports.idl" + +[scriptable, uuid(e72546a4-9b57-4766-a3aa-c05cbc7d8156)] +interface nsIIdentityInfo : nsISupports +{ + readonly attribute boolean isExtendedValidation; +}; + diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index a21482346905..9fc4691b5c9c 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -95,6 +95,7 @@ CPPSRCS = \ nsSmartCardEvent.cpp \ nsStreamCipher.cpp \ nsKeyModule.cpp \ + nsIdentityChecking.cpp \ $(NULL) ifdef MOZ_XUL diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp new file mode 100644 index 000000000000..90cf39de6ef1 --- /dev/null +++ b/security/manager/ssl/src/nsIdentityChecking.cpp @@ -0,0 +1,11 @@ +#include "nsNSSIOLayer.h" + +NS_IMETHODIMP +nsNSSSocketInfo::GetIsExtendedValidation(PRBool* aIsEV) +{ + NS_ENSURE_ARG(aIsEV); + *aIsEV = PR_FALSE; + + return NS_OK; +} + diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp index e0292afb3d89..522c2cce5b14 100644 --- a/security/manager/ssl/src/nsNSSCallbacks.cpp +++ b/security/manager/ssl/src/nsNSSCallbacks.cpp @@ -843,8 +843,13 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) { CERTCertificate *serverCert = SSL_PeerCertificate(fd); if (serverCert) { - status->mServerCert = new nsNSSCertificate(serverCert); + nsRefPtr nssc = new nsNSSCertificate(serverCert); CERT_DestroyCertificate(serverCert); + serverCert = nsnull; + infoObject->SetCert(nssc); + if (!status->mServerCert) { + status->mServerCert = nssc; + } } status->mKeyLength = keyLength; diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index 4772b2ba2f69..12cbb40b097f 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -231,11 +231,12 @@ void nsNSSSocketInfo::destructorSafeDestroyNSSReference() } } -NS_IMPL_THREADSAFE_ISUPPORTS4(nsNSSSocketInfo, +NS_IMPL_THREADSAFE_ISUPPORTS5(nsNSSSocketInfo, nsITransportSecurityInfo, nsISSLSocketControl, nsIInterfaceRequestor, - nsISSLStatusProvider) + nsISSLStatusProvider, + nsIIdentityInfo) nsresult nsNSSSocketInfo::GetHandshakePending(PRBool *aHandshakePending) @@ -504,6 +505,23 @@ nsresult nsNSSSocketInfo::SetFileDescPtr(PRFileDesc* aFilePtr) return NS_OK; } +nsresult nsNSSSocketInfo::GetCert(nsNSSCertificate** _result) +{ + NS_ENSURE_ARG_POINTER(_result); + + *_result = mCert; + NS_IF_ADDREF(*_result); + + return NS_OK; +} + +nsresult nsNSSSocketInfo::SetCert(nsNSSCertificate *aCert) +{ + mCert = aCert; + + return NS_OK; +} + nsresult nsNSSSocketInfo::GetSSLStatus(nsISupports** _result) { NS_ENSURE_ARG_POINTER(_result); diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/src/nsNSSIOLayer.h index 4d1fcaea0afa..228416b9c34f 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.h +++ b/security/manager/ssl/src/nsNSSIOLayer.h @@ -51,8 +51,11 @@ #include "nsISSLSocketControl.h" #include "nsISSLStatus.h" #include "nsISSLStatusProvider.h" +#include "nsIIdentityInfo.h" #include "nsXPIDLString.h" #include "nsNSSShutDown.h" +#include "nsAutoPtr.h" +#include "nsNSSCertificate.h" class nsIChannel; class nsSSLThread; @@ -123,6 +126,7 @@ class nsNSSSocketInfo : public nsITransportSecurityInfo, public nsISSLSocketControl, public nsIInterfaceRequestor, public nsISSLStatusProvider, + public nsIIdentityInfo, public nsNSSShutDownObject, public nsOnPK11LogoutCancelObject { @@ -135,6 +139,7 @@ public: NS_DECL_NSISSLSOCKETCONTROL NS_DECL_NSIINTERFACEREQUESTOR NS_DECL_NSISSLSTATUSPROVIDER + NS_DECL_NSIIDENTITYINFO nsresult SetSecurityState(PRUint32 aState); nsresult SetShortSecurityDescription(const PRUnichar *aText); @@ -155,6 +160,9 @@ public: nsresult GetPort(PRInt32 *aPort); nsresult SetPort(PRInt32 aPort); + nsresult GetCert(nsNSSCertificate** _result); + nsresult SetCert(nsNSSCertificate *aCert); + void SetCanceled(PRBool aCanceled); PRBool GetCanceled(); @@ -187,6 +195,7 @@ public: protected: nsCOMPtr mCallbacks; PRFileDesc* mFd; + nsRefPtr mCert; enum { blocking_state_unknown, is_nonblocking_socket, is_blocking_socket } mBlockingState; From 08651ae54945aaaa5c99bb938613b24e71ca5e46 Mon Sep 17 00:00:00 2001 From: "gijskruitbosch@gmail.com" Date: Thu, 23 Aug 2007 14:30:29 -0700 Subject: [PATCH 356/368] Bug 372453 - XULRunner apps on mac without a hiddenwindow should be able to quit r=benjamin@smedbergs.us r=joshmoz@gmail.com a=bzbarsky@mit.edu --- .../components/startup/src/nsAppStartup.cpp | 39 ++++++++++++++++--- xpfe/appshell/public/nsIAppShellService.idl | 7 ++++ xpfe/appshell/src/nsAppShellService.cpp | 11 +++++- xpfe/appshell/src/nsAppShellService.h | 1 + 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/toolkit/components/startup/src/nsAppStartup.cpp b/toolkit/components/startup/src/nsAppStartup.cpp index 6ec6fa545ca3..b91b7a2e7a2e 100644 --- a/toolkit/components/startup/src/nsAppStartup.cpp +++ b/toolkit/components/startup/src/nsAppStartup.cpp @@ -207,9 +207,33 @@ nsAppStartup::Quit(PRUint32 aMode) if (!mRestart) mRestart = aMode & eRestart; - if (ferocity == eConsiderQuit && mConsiderQuitStopper == 0) { - // attempt quit if the last window has been unregistered/closed - ferocity = eAttemptQuit; + // If we're considering quitting, we will only do so if: + if (ferocity == eConsiderQuit) { + if (mConsiderQuitStopper == 0) { + // there are no windows... + ferocity = eAttemptQuit; + } +#ifdef XP_MACOSX + else if (mConsiderQuitStopper == 1) { + // ... or there is only a hiddenWindow left, and it's useless: + nsCOMPtr appShell + (do_GetService(NS_APPSHELLSERVICE_CONTRACTID)); + + // Failure shouldn't be fatal, but will abort quit attempt: + if (!appShell) + return NS_OK; + + PRBool usefulHiddenWindow; + appShell->GetApplicationProvidedHiddenWindow(&usefulHiddenWindow); + nsCOMPtr hiddenWindow; + appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow)); + // If the one window is useful, we won't quit: + if (!hiddenWindow || usefulHiddenWindow) + return NS_OK; + + ferocity = eAttemptQuit; + } +#endif } /* Currently ferocity can never have the value of eForceQuit here. @@ -369,8 +393,13 @@ nsAppStartup::ExitLastWindowClosingSurvivalArea(void) NS_ASSERTION(mConsiderQuitStopper > 0, "consider quit stopper out of bounds"); --mConsiderQuitStopper; - if (!mShuttingDown && mRunning && mConsiderQuitStopper == 0) - Quit(eAttemptQuit); +#ifdef XP_MACOSX + if (!mShuttingDown && mRunning && (mConsiderQuitStopper <= 1)) + Quit(eConsiderQuit); +#else + if (!mShuttingDown && mRunning && (mConsiderQuitStopper == 0)) + Quit(eConsiderQuit); +#endif return NS_OK; } diff --git a/xpfe/appshell/public/nsIAppShellService.idl b/xpfe/appshell/public/nsIAppShellService.idl index 65416fbf8b36..e5b5c98fa6b7 100644 --- a/xpfe/appshell/public/nsIAppShellService.idl +++ b/xpfe/appshell/public/nsIAppShellService.idl @@ -110,6 +110,13 @@ interface nsIAppShellService : nsISupports void getHiddenWindowAndJSContext(out nsIDOMWindowInternal aHiddenDOMWindow, out JSContext aJSContext); + /** + * Return true if the application hidden window was provided by the + * application. If it wasn't, the default hidden window was used. This will + * usually be false on all non-mac platforms. + */ + readonly attribute boolean applicationProvidedHiddenWindow; + /** * Add a window to the application's registry of windows. These windows * are generally shown in the Windows taskbar, and the application diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index 6b0bdf0b07cf..11e3c82f4a83 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -84,7 +84,8 @@ class nsIAppShell; nsAppShellService::nsAppShellService() : mXPCOMShuttingDown(PR_FALSE), - mModalWindowCount(0) + mModalWindowCount(0), + mApplicationProvidedHiddenWindow(PR_FALSE) { nsCOMPtr obs (do_GetService("@mozilla.org/observer-service;1")); @@ -162,6 +163,7 @@ nsAppShellService::CreateHiddenWindow(nsIAppShell* aAppShell) nsXPIDLCString prefVal; rv = prefBranch->GetCharPref("browser.hiddenWindowChromeURL", getter_Copies(prefVal)); const char* hiddenWindowURL = prefVal.get() ? prefVal.get() : DEFAULT_HIDDENWINDOW_URL; + mApplicationProvidedHiddenWindow = prefVal.get() ? PR_TRUE : PR_FALSE; #else static const char hiddenWindowURL[] = DEFAULT_HIDDENWINDOW_URL; PRUint32 chromeMask = nsIWebBrowserChrome::CHROME_ALL; @@ -446,6 +448,13 @@ nsAppShellService::GetHiddenWindowAndJSContext(nsIDOMWindowInternal **aWindow, return rv; } +NS_IMETHODIMP +nsAppShellService::GetApplicationProvidedHiddenWindow(PRBool* aAPHW) +{ + *aAPHW = mApplicationProvidedHiddenWindow; + return NS_OK; +} + /* * Register a new top level window (created elsewhere) */ diff --git a/xpfe/appshell/src/nsAppShellService.h b/xpfe/appshell/src/nsAppShellService.h index ee31907232b7..de8d9960d3a7 100644 --- a/xpfe/appshell/src/nsAppShellService.h +++ b/xpfe/appshell/src/nsAppShellService.h @@ -76,6 +76,7 @@ protected: nsRefPtr mHiddenWindow; PRPackedBool mXPCOMShuttingDown; PRUint16 mModalWindowCount; + PRPackedBool mApplicationProvidedHiddenWindow; }; #endif From 92d8ef71f1585f907d804cb0a9c25a4b50ddf8db Mon Sep 17 00:00:00 2001 From: "Olli.Pettay@helsinki.fi" Date: Thu, 23 Aug 2007 14:38:55 -0700 Subject: [PATCH 357/368] Bug 393294, DOM event leaks (patch 2), r+sr+a=jst --- content/events/src/nsDOMBeforeUnloadEvent.cpp | 5 +++++ content/events/src/nsDOMCommandEvent.cpp | 8 ++++++++ content/events/src/nsDOMCommandEvent.h | 1 + 3 files changed, 14 insertions(+) diff --git a/content/events/src/nsDOMBeforeUnloadEvent.cpp b/content/events/src/nsDOMBeforeUnloadEvent.cpp index 3a51500e5917..99193648efdd 100644 --- a/content/events/src/nsDOMBeforeUnloadEvent.cpp +++ b/content/events/src/nsDOMBeforeUnloadEvent.cpp @@ -59,6 +59,11 @@ nsDOMBeforeUnloadEvent::nsDOMBeforeUnloadEvent(nsPresContext* aPresContext, nsDOMBeforeUnloadEvent::~nsDOMBeforeUnloadEvent() { + if (mEventIsInternal && + mEvent->eventStructType == NS_BEFORE_PAGE_UNLOAD_EVENT) { + delete static_cast(mEvent); + mEvent = nsnull; + } } NS_IMPL_ADDREF_INHERITED(nsDOMBeforeUnloadEvent, nsDOMEvent) diff --git a/content/events/src/nsDOMCommandEvent.cpp b/content/events/src/nsDOMCommandEvent.cpp index b7c3ca4c3c46..bd47d02a0c85 100644 --- a/content/events/src/nsDOMCommandEvent.cpp +++ b/content/events/src/nsDOMCommandEvent.cpp @@ -51,6 +51,14 @@ nsDOMCommandEvent::nsDOMCommandEvent(nsPresContext* aPresContext, } } +nsDOMCommandEvent::~nsDOMCommandEvent() +{ + if (mEventIsInternal && mEvent->eventStructType == NS_COMMAND_EVENT) { + delete static_cast(mEvent); + mEvent = nsnull; + } +} + NS_INTERFACE_MAP_BEGIN(nsDOMCommandEvent) NS_INTERFACE_MAP_ENTRY(nsIDOMCommandEvent) NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CommandEvent) diff --git a/content/events/src/nsDOMCommandEvent.h b/content/events/src/nsDOMCommandEvent.h index 1700d537eb8a..69c47f39c169 100644 --- a/content/events/src/nsDOMCommandEvent.h +++ b/content/events/src/nsDOMCommandEvent.h @@ -47,6 +47,7 @@ class nsDOMCommandEvent : public nsDOMEvent, public: nsDOMCommandEvent(nsPresContext* aPresContext, nsCommandEvent* aEvent); + virtual ~nsDOMCommandEvent(); NS_DECL_ISUPPORTS_INHERITED From a0aa4406f7898f581e259478d03df35130fc1a27 Mon Sep 17 00:00:00 2001 From: "mozilla@weilbacher.org" Date: Thu, 23 Aug 2007 14:41:38 -0700 Subject: [PATCH 358/368] Bug 385888: Removal of non-Cairo code from windows/nsWindow, p=alfredkayser, r=emaijala, sr=roc, a=pavlov --- widget/src/windows/nsWindow.cpp | 525 +------------------------------- widget/src/windows/nsWindow.h | 32 -- 2 files changed, 11 insertions(+), 546 deletions(-) diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp index 2d48b6a02c2e..fa04cb1799dc 100644 --- a/widget/src/windows/nsWindow.cpp +++ b/widget/src/windows/nsWindow.cpp @@ -101,12 +101,8 @@ #include "resource.h" #include #include "prtime.h" -#ifdef MOZ_CAIRO_GFX #include "gfxContext.h" #include "gfxWindowsSurface.h" -#else -#include "nsIRenderingContextWin.h" -#endif #include "nsIImage.h" #ifdef ACCESSIBILITY @@ -786,9 +782,7 @@ nsWindow::nsWindow() : nsBaseWidget() #ifdef MOZ_XUL mIsTranslucent = PR_FALSE; mIsTopTranslucent = PR_FALSE; -#ifdef MOZ_CAIRO_GFX mTranslucentSurface = nsnull; -#endif mMemoryDC = NULL; mMemoryBitmap = NULL; mMemoryBits = NULL; @@ -2599,84 +2593,6 @@ static PRUint8* Data32BitTo1Bit(PRUint8* aImageData, return outData; } -// static -PRUint8* nsWindow::Data8BitTo1Bit(PRUint8* aAlphaData, - PRUint32 aAlphaBytesPerRow, - PRUint32 aWidth, PRUint32 aHeight) -{ - // We need (aWidth + 7) / 8 bytes plus zero-padding up to a multiple of - // 4 bytes for each row (HBITMAP requirement). Bug 353553. - PRUint32 outBpr = ((aWidth + 31) / 8) & ~3; - - PRUint8* outData = new PRUint8[outBpr * aHeight]; - if (!outData) - return NULL; - - PRUint8 *outRow = outData, - *alphaRow = aAlphaData; - - for (PRUint32 curRow = 0; curRow < aHeight; curRow++) { - PRUint8 *arow = alphaRow; - PRUint8 *nextOutRow = outRow + outBpr; - PRUint8 alphaPixels = 0; - PRUint8 offset = 7; - - for (PRUint32 curCol = 0; curCol < aWidth; curCol++) { - if (*alphaRow++ > 0) - alphaPixels |= (1 << offset); - - if (offset == 0) { - *outRow++ = alphaPixels; - offset = 7; - alphaPixels = 0; - } else { - offset--; - } - } - if (offset != 7) - *outRow++ = alphaPixels; - - alphaRow = arow + aAlphaBytesPerRow; - while (outRow != nextOutRow) - *outRow++ = 0; // padding - } - - return outData; -} - -// static -PRUint8* nsWindow::DataToAData(PRUint8* aImageData, PRUint32 aImageBytesPerRow, - PRUint8* aAlphaData, PRUint32 aAlphaBytesPerRow, - PRUint32 aWidth, PRUint32 aHeight) -{ - // We will have 32 bpp, so bytes per row will be 4 * w - PRUint32 outBpr = aWidth * 4; - - // Avoid overflows - if (aWidth > 0xfff || aHeight > 0xfff) - return NULL; - - PRUint8* outData = new PRUint8[outBpr * aHeight]; - if (!outData) - return NULL; - - PRUint8 *outRow = outData, - *imageRow = aImageData, - *alphaRow = aAlphaData; - for (PRUint32 curRow = 0; curRow < aHeight; curRow++) { - PRUint8 *irow = imageRow, *arow = alphaRow; - for (PRUint32 curCol = 0; curCol < aWidth; curCol++) { - *outRow++ = *imageRow++; // B - *outRow++ = *imageRow++; // G - *outRow++ = *imageRow++; // R - *outRow++ = *alphaRow++; // A - } - imageRow = irow + aImageBytesPerRow; - alphaRow = arow + aAlphaBytesPerRow; - } - return outData; -} - // static HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData, PRUint32 aWidth, @@ -2769,38 +2685,6 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData, return bmp; } -// static -HBITMAP nsWindow::CreateOpaqueAlphaChannel(PRUint32 aWidth, PRUint32 aHeight) -{ - // Make up an opaque alpha channel. - // We need (aWidth + 7) / 8 bytes plus zero-padding up to a multiple of - // 4 bytes for each row (HBITMAP requirement). Bug 353553. - PRUint32 nonPaddedBytesPerRow = (aWidth + 7) / 8; - PRUint32 abpr = (nonPaddedBytesPerRow + 3) & ~3; - PRUint32 bufferSize = abpr * aHeight; - PRUint8* opaque = (PRUint8*)malloc(bufferSize); - if (!opaque) - return NULL; - - memset(opaque, 0xff, bufferSize); - - // If we have row padding, set it to zero. - if (nonPaddedBytesPerRow != abpr) { - PRUint8* p = opaque; - PRUint8* end = opaque + bufferSize; - while (p != end) { - PRUint8* nextRow = p + abpr; - p += nonPaddedBytesPerRow; - while (p != nextRow) - *p++ = 0; // padding - } - } - - HBITMAP hAlpha = DataToBitmap(opaque, aWidth, aHeight, 1); - free(opaque); - return hAlpha; -} - NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor, PRUint32 aHotspotX, PRUint32 aHotspotY) { @@ -2826,7 +2710,6 @@ NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor, if (width > 128 || height > 128) return NS_ERROR_NOT_AVAILABLE; -#ifdef MOZ_CAIRO_GFX PRUint32 bpr; gfx_format format; frame->GetImageBytesPerRow(&bpr); @@ -2906,134 +2789,6 @@ NS_IMETHODIMP nsWindow::SetCursor(imgIContainer* aCursor, ::DestroyIcon(gHCursor); gHCursor = cursor; -#else - - gfx_format format; - nsresult rv = frame->GetFormat(&format); - if (NS_FAILED(rv)) - return rv; - - if (format != gfxIFormats::BGR_A1 && format != gfxIFormats::BGR_A8 && - format != gfxIFormats::BGR) - return NS_ERROR_UNEXPECTED; - - // On Win2k with nVidia video drivers 71.84 at 32 bit color, cursors that - // have 8 bit alpha are truncated to 64x64. Skip cursors larger than that. - // This is redundant with checks above, but we'll leave it in as a reminder - // in case we start accepting larger cursors again - if (IsWin2k() && (format == gfxIFormats::BGR_A8) && - (width > 64 || height > 64)) - return NS_ERROR_FAILURE; - - PRUint32 bpr; - rv = frame->GetImageBytesPerRow(&bpr); - if (NS_FAILED(rv)) - return rv; - - frame->LockImageData(); - PRUint32 dataLen; - PRUint8* data; - rv = frame->GetImageData(&data, &dataLen); - if (NS_FAILED(rv)) { - frame->UnlockImageData(); - return rv; - } - - HBITMAP hBMP = NULL; - if (format != gfxIFormats::BGR_A8) { - hBMP = DataToBitmap(data, width, height, 24); - if (hBMP == NULL) { - frame->UnlockImageData(); - return NS_ERROR_FAILURE; - } - } - - HBITMAP hAlpha = NULL; - if (format == gfxIFormats::BGR) { - hAlpha = CreateOpaqueAlphaChannel(width, height); - } else { - PRUint32 abpr; - rv = frame->GetAlphaBytesPerRow(&abpr); - if (NS_FAILED(rv)) { - frame->UnlockImageData(); - if (hBMP != NULL) - ::DeleteObject(hBMP); - return rv; - } - - PRUint8* adata; - frame->LockAlphaData(); - rv = frame->GetAlphaData(&adata, &dataLen); - if (NS_FAILED(rv)) { - if (hBMP != NULL) - ::DeleteObject(hBMP); - frame->UnlockImageData(); - frame->UnlockAlphaData(); - return rv; - } - - if (format == gfxIFormats::BGR_A8) { - // Convert BGR_A8 to BGRA. - // Some platforms (or video cards?) on 32bit color mode will ignore - // hAlpha. For them, we could speed up things by creating an opaque alpha - // channel, but since we don't know how to determine whether hAlpha is - // ignored, create a proper 1 bit alpha channel to supplement the RGBA. - // Plus, on non-32bit color and possibly other platforms, the alpha - // of RGBA is ignored. - PRUint8* bgra8data = DataToAData(data, bpr, adata, abpr, width, height); - if (bgra8data) { - hBMP = DataToBitmap(bgra8data, width, height, 32); - if (hBMP != NULL) { - PRUint8* a1data = Data8BitTo1Bit(adata, abpr, width, height); - if (a1data) { - hAlpha = DataToBitmap(a1data, width, height, 1); - delete [] a1data; - } - } - delete [] bgra8data; - } - } else { - hAlpha = DataToBitmap(adata, width, height, 1); - } - - frame->UnlockAlphaData(); - } - frame->UnlockImageData(); - if (hBMP == NULL) { - return NS_ERROR_FAILURE; - } - if (hAlpha == NULL) { - ::DeleteObject(hBMP); - return NS_ERROR_FAILURE; - } - - ICONINFO info = {0}; - info.fIcon = FALSE; - info.xHotspot = aHotspotX; - info.yHotspot = aHotspotY; - info.hbmMask = hAlpha; - info.hbmColor = hBMP; - - HCURSOR cursor = ::CreateIconIndirect(&info); - ::DeleteObject(hBMP); - ::DeleteObject(hAlpha); - if (cursor == NULL) { - return NS_ERROR_FAILURE; - } - - mCursor = nsCursor(-1); - ::SetCursor(cursor); - - NS_IF_RELEASE(gCursorImgContainer); - gCursorImgContainer = aCursor; - NS_ADDREF(gCursorImgContainer); - - if (gHCursor != NULL) - ::DestroyIcon(gHCursor); - gHCursor = cursor; - -#endif - return NS_OK; } @@ -4465,12 +4220,8 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT break; case WM_PAINT: -#ifdef MOZ_CAIRO_GFX *aRetValue = (int) OnPaint(); result = PR_TRUE; -#else - result = OnPaint(); -#endif break; #ifndef WINCE @@ -5950,7 +5701,6 @@ PRBool nsWindow::OnPaint(HDC aDC) (PRInt32) mWnd); #endif // NS_DEBUG -#ifdef MOZ_CAIRO_GFX #ifdef MOZ_XUL nsRefPtr targetSurface; if (mIsTranslucent) { @@ -6009,43 +5759,6 @@ PRBool nsWindow::OnPaint(HDC aDC) } #endif -#else - /* Non-cairo GFX */ - if (NS_SUCCEEDED(CallCreateInstance(kRenderingContextCID, &event.renderingContext))) - { - nsIRenderingContextWin *winrc; - if (NS_SUCCEEDED(CallQueryInterface(event.renderingContext, &winrc))) - { - nsIDrawingSurface* surf; - - //i know all of this seems a little backwards. i'll fix it, i swear. MMP - - if (NS_OK == winrc->CreateDrawingSurface(hDC, surf)) - { - event.renderingContext->Init(mContext, surf); - result = DispatchWindowEvent(&event, eventStatus); - event.renderingContext->DestroyDrawingSurface(surf); - -#ifdef MOZ_XUL - if (mIsTranslucent) - { - // Data from offscreen drawing surface was copied to memory bitmap of transparent - // bitmap. Now it can be read from memory bitmap to apply alpha channel and after - // that displayed on the screen. - UpdateTranslucentWindow(); - } -#endif - } - - NS_RELEASE(winrc); - } - - NS_RELEASE(event.renderingContext); - } - else - result = PR_FALSE; -#endif - NS_RELEASE(event.widget); } } @@ -8223,7 +7936,6 @@ nsWindow* nsWindow::GetTopLevelWindow() } } -#ifdef MOZ_CAIRO_GFX gfxASurface *nsWindow::GetThebesSurface() { if (mPaintDC) @@ -8231,98 +7943,15 @@ gfxASurface *nsWindow::GetThebesSurface() return (new gfxWindowsSurface(mWnd)); } -#endif void nsWindow::ResizeTranslucentWindow(PRInt32 aNewWidth, PRInt32 aNewHeight, PRBool force) { if (!force && aNewWidth == mBounds.width && aNewHeight == mBounds.height) return; -#ifdef MOZ_CAIRO_GFX mTranslucentSurface = new gfxWindowsSurface(gfxIntSize(aNewWidth, aNewHeight), gfxASurface::ImageFormatARGB32); mMemoryDC = mTranslucentSurface->GetDC(); mMemoryBitmap = NULL; -#else - // resize the alpha mask - PRUint8* pBits; - - if (aNewWidth > 0 && aNewHeight > 0) - { - pBits = new PRUint8 [aNewWidth * aNewHeight]; - - if (pBits && mAlphaMask) - { - PRInt32 copyWidth, copyHeight; - PRInt32 growWidth, growHeight; - - if (aNewWidth > mBounds.width) - { - copyWidth = mBounds.width; - growWidth = aNewWidth - mBounds.width; - } else - { - copyWidth = aNewWidth; - growWidth = 0; - } - - if (aNewHeight > mBounds.height) - { - copyHeight = mBounds.height; - growHeight = aNewHeight - mBounds.height; - } else - { - copyHeight = aNewHeight; - growHeight = 0; - } - - PRUint8* pSrc = mAlphaMask; - PRUint8* pDest = pBits; - - for (PRInt32 cy = 0 ; cy < copyHeight ; cy++) - { - memcpy(pDest, pSrc, copyWidth); - memset(pDest + copyWidth, 255, growWidth); - pSrc += mBounds.width; - pDest += aNewWidth; - } - - for (PRInt32 gy = 0 ; gy < growHeight ; gy++) - { - memset(pDest, 255, aNewWidth); - pDest += aNewWidth; - } - } - } else - pBits = nsnull; - - delete [] mAlphaMask; - mAlphaMask = pBits; - - if (!mMemoryDC) - mMemoryDC = ::CreateCompatibleDC(NULL); - - // Always use at least 24-bit bitmaps regardless of the device context. - int depth = ::GetDeviceCaps(mMemoryDC, BITSPIXEL); - if (depth < 24) - depth = 24; - - // resize the memory bitmap - BITMAPINFO bi = { 0 }; - bi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER); - bi.bmiHeader.biWidth = aNewWidth; - bi.bmiHeader.biHeight = -aNewHeight; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = depth; - bi.bmiHeader.biCompression = BI_RGB; - - mMemoryBitmap = ::CreateDIBSection(mMemoryDC, &bi, DIB_RGB_COLORS, (void**)&mMemoryBits, NULL, 0); - - if (mMemoryBitmap) - { - HGDIOBJ oldBitmap = ::SelectObject(mMemoryDC, mMemoryBitmap); - ::DeleteObject(oldBitmap); - } -#endif } NS_IMETHODIMP nsWindow::GetWindowTranslucency(PRBool& aTranslucent) @@ -8412,15 +8041,7 @@ nsresult nsWindow::SetupTranslucentWindowMemoryBitmap(PRBool aTranslucent) if (aTranslucent) { ResizeTranslucentWindow(mBounds.width, mBounds.height, PR_TRUE); } else { -#ifdef MOZ_CAIRO_GFX mTranslucentSurface = nsnull; -#else - if (mMemoryDC) - ::DeleteDC(mMemoryDC); - if (mMemoryBitmap) - ::DeleteObject(mMemoryBitmap); -#endif - mMemoryDC = NULL; mMemoryBitmap = NULL; } @@ -8430,35 +8051,7 @@ nsresult nsWindow::SetupTranslucentWindowMemoryBitmap(PRBool aTranslucent) void nsWindow::UpdateTranslucentWindowAlphaInner(const nsRect& aRect, PRUint8* aAlphas) { -#ifdef MOZ_CAIRO_GFX - NS_ERROR("nsWindow::UpdateTranslucentWindowAlphaInner called, when it sholdn't be!"); -#else - NS_ASSERTION(mIsTranslucent, "Window is not transparent"); - NS_ASSERTION(aRect.x >= 0 && aRect.y >= 0 && - aRect.XMost() <= mBounds.width && aRect.YMost() <= mBounds.height, - "Rect is out of window bounds"); - - PRBool transparencyMaskChanged = PR_FALSE; - - if (!aRect.IsEmpty()) - { - PRUint8* pSrcRow = aAlphas; - PRUint8* pDestRow = mAlphaMask + aRect.y * mBounds.width + aRect.x; - - for (PRInt32 y = 0 ; y < aRect.height ; y++) - { - memcpy(pDestRow, pSrcRow, aRect.width); - - pSrcRow += aRect.width; - pDestRow += mBounds.width; - } - } - - // Windows 2000 and newer versions support layered windows which allow to implement - // full 256 level alpha translucency. - // The real screen update is performed in OnPaint() handler only after rendered - // bits from offscreen drawing surface are copied back to memory bitmap. -#endif + NS_ERROR("nsWindow::UpdateTranslucentWindowAlphaInner called, when it shouldn't be!"); } nsresult nsWindow::UpdateTranslucentWindow() @@ -8466,116 +8059,20 @@ nsresult nsWindow::UpdateTranslucentWindow() if (mBounds.IsEmpty()) return NS_OK; - nsresult rv = NS_ERROR_FAILURE; - ::GdiFlush(); - HDC hMemoryDC; - PRBool needConversion; + BLENDFUNCTION bf = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + SIZE winSize = { mBounds.width, mBounds.height }; + POINT srcPos = { 0, 0 }; + HWND hWnd = GetTopLevelHWND(mWnd, PR_TRUE); + RECT winRect; + ::GetWindowRect(hWnd, &winRect); -#ifdef MOZ_CAIRO_GFX + // perform the alpha blend + if (!::UpdateLayeredWindow(hWnd, NULL, (POINT*)&winRect, &winSize, mMemoryDC, &srcPos, 0, &bf, ULW_ALPHA)) + return NS_ERROR_FAILURE; - hMemoryDC = mMemoryDC; - needConversion = PR_FALSE; - - rv = NS_OK; - -#else - - HBITMAP hAlphaBitmap; - int depth = ::GetDeviceCaps(mMemoryDC, BITSPIXEL); - if (depth < 24) - depth = 24; - - needConversion = (depth == 24); - - if (needConversion) - { - hMemoryDC = ::CreateCompatibleDC(NULL); - - if (hMemoryDC) - { - // Memory bitmap with alpha channel - BITMAPINFO bi = { 0 }; - bi.bmiHeader.biSize = sizeof (BITMAPINFOHEADER); - bi.bmiHeader.biWidth = mBounds.width; - bi.bmiHeader.biHeight = -mBounds.height; - bi.bmiHeader.biPlanes = 1; - bi.bmiHeader.biBitCount = 32; - bi.bmiHeader.biCompression = BI_RGB; - - PRUint8* pBits32 = nsnull; - hAlphaBitmap = ::CreateDIBSection(hMemoryDC, &bi, DIB_RGB_COLORS, (void**)&pBits32, NULL, 0); - - if (hAlphaBitmap) - { - HGDIOBJ oldBitmap = ::SelectObject(hMemoryDC, hAlphaBitmap); - - PRUint8* pPixel32 = pBits32; - PRUint8* pAlpha = mAlphaMask; - PRUint32 rasWidth = RASWIDTH(mBounds.width, 24); - - for (PRInt32 y = 0 ; y < mBounds.height ; y++) - { - PRUint8* pPixel = mMemoryBits + y * rasWidth; - - for (PRInt32 x = 0 ; x < mBounds.width ; x++) - { - *pPixel32++ = *pPixel++; - *pPixel32++ = *pPixel++; - *pPixel32++ = *pPixel++; - *pPixel32++ = *pAlpha++; - } - } - - rv = NS_OK; - } - } - } else - { - hMemoryDC = mMemoryDC; - - if (hMemoryDC) - { - PRUint8* pPixel = mMemoryBits + 3; // Point to alpha component of pixel - PRUint8* pAlpha = mAlphaMask; - PRInt32 pixels = mBounds.width * mBounds.height; - - for (PRInt32 cnt = 0 ; cnt < pixels ; cnt++) - { - *pPixel = *pAlpha++; - pPixel += 4; - } - - rv = NS_OK; - } - } -#endif /* MOZ_CAIRO_GFX */ - - if (rv == NS_OK) - { - BLENDFUNCTION bf = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - SIZE winSize = { mBounds.width, mBounds.height }; - POINT srcPos = { 0, 0 }; - HWND hWnd = GetTopLevelHWND(mWnd, PR_TRUE); - RECT winRect; - ::GetWindowRect(hWnd, &winRect); - - // perform the alpha blend - if (!::UpdateLayeredWindow(hWnd, NULL, (POINT*)&winRect, &winSize, hMemoryDC, &srcPos, 0, &bf, ULW_ALPHA)) - rv = NS_ERROR_FAILURE; - } - - - if (needConversion) - { -#ifndef MOZ_CAIRO_GFX - ::DeleteObject(hAlphaBitmap); -#endif - ::DeleteDC(hMemoryDC); - } - - return rv; + return NS_OK; } #endif diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h index de6c71d2799f..845ed4922e95 100644 --- a/widget/src/windows/nsWindow.h +++ b/widget/src/windows/nsWindow.h @@ -489,28 +489,6 @@ protected: static HCURSOR gHCursor; static imgIContainer* gCursorImgContainer; - /** - * Create a 1 bit mask out of a 8 bit alpha layer. - * - * @param aAlphaData 8 bit alpha data - * @param aAlphaBytesPerRow How many bytes one row of data is - * @param aWidth Width of the alpha data, in pixels - * @param aHeight Height of the alpha data, in pixels - * - * @return 1 bit mask. Must be delete[]d. On failure, NULL will be returned. - */ - static PRUint8* Data8BitTo1Bit(PRUint8* aAlphaData, PRUint32 aAlphaBytesPerRow, - PRUint32 aWidth, PRUint32 aHeight); - - /** - * Combine the given image data with a separate alpha channel to image data - * with the alpha channel interleaved with the image data (BGRA). - * - * @return BGRA data. Must be delete[]d. On failure, NULL will be returned. - */ - static PRUint8* DataToAData(PRUint8* aImageData, PRUint32 aImageBytesPerRow, - PRUint8* aAlphaData, PRUint32 aAlphaBytesPerRow, - PRUint32 aWidth, PRUint32 aHeight); /** * Convert the given image data to a HBITMAP. If the requested depth is * 32 bit and the OS supports translucency, a bitmap with an alpha channel @@ -531,16 +509,6 @@ protected: PRUint32 aHeight, PRUint32 aDepth); - /** - * Create a bitmap representing an opaque alpha channel (filled with 0xff). - * @param aWidth Desired with of the bitmap - * @param aHeight Desired height of the bitmap - * @return The bitmap. Caller should call DeleteObject when done with - * the bitmap. On failure, NULL will be returned. - */ - static HBITMAP CreateOpaqueAlphaChannel(PRUint32 aWidth, PRUint32 aHeight); - - #ifdef ACCESSIBILITY static BOOL gIsAccessibilityOn; static HINSTANCE gmAccLib; From 813ece34ceb76643c13d9f9462132efd42481c0a Mon Sep 17 00:00:00 2001 From: "mozilla@weilbacher.org" Date: Thu, 23 Aug 2007 14:48:47 -0700 Subject: [PATCH 359/368] [OS/2] no bug, fix irritating indent of debug printf --- widget/src/os2/nsWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widget/src/os2/nsWindow.cpp b/widget/src/os2/nsWindow.cpp index ea33a63c3f03..015af1a1045e 100644 --- a/widget/src/os2/nsWindow.cpp +++ b/widget/src/os2/nsWindow.cpp @@ -1525,7 +1525,8 @@ NS_METHOD nsWindow::Resize(PRInt32 aX, Invalidate(PR_FALSE); #if DEBUG_sobotka - printf("+++++++++++Resized 0x%lx at %ld, %ld to %d x %d (%d,%d)\n", mWnd, ptl.x, ptl.y, w, h, aX, aY); + printf("+++++++++++Resized 0x%lx at %ld, %ld to %d x %d (%d,%d)\n", + mWnd, ptl.x, ptl.y, w, h, aX, aY); #endif } From 0c716b03a2c65c7d302682e38c51361956920274 Mon Sep 17 00:00:00 2001 From: "neil@parkwaycc.co.uk" Date: Thu, 23 Aug 2007 14:52:19 -0700 Subject: [PATCH 360/368] uriloader/exthandler dependencies not working in Windows b=393270 r=luser --- config/rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index df44148b6d41..2b4f0daacb09 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1144,7 +1144,7 @@ if test -d $(@D); then \ touch $(_MDDEPFILE) && \ $(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \ mv $(_MDDEPFILE) $(_MDDEPFILE).old && \ - cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)/||" -e "s|^$(win_srcdir)/||" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \ + cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)[^ ]*/||" -e "s|^$(win_srcdir)[^ ]*/||" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \ fi endef else @@ -1903,7 +1903,7 @@ define MAKE_DEPS_NOAUTO set -e ; \ touch $@ && \ $(MKDEPEND) -w1024 -o'.$(OBJ_SUFFIX)' -f$@ $(DEFINES) $(ACDEFINES) $(INCLUDES) $(srcdir)/$(/dev/null 2>&1 && \ - mv $@ $@.old && cat $@.old | sed "s|^$(srcdir)/||g" > $@ && rm -f $@.old + mv $@ $@.old && cat $@.old | sed "s|^$(srcdir)[^ ]*/||g" > $@ && rm -f $@.old endef else define MAKE_DEPS_NOAUTO From 83ffd0f377352f73cd8d129e6518b12639a482e4 Mon Sep 17 00:00:00 2001 From: "jwalden@mit.edu" Date: Thu, 23 Aug 2007 15:07:40 -0700 Subject: [PATCH 361/368] Bug 370245 - Make the HTTP server asynchronously process requests, and pave the way for future improvements to processing. r=biesi, a=bsmedberg on a testing-only change --- netwerk/test/httpserver/README | 4 + netwerk/test/httpserver/TODO | 5 - netwerk/test/httpserver/httpd.js | 1811 ++++++++++++-------- netwerk/test/httpserver/nsIHttpServer.idl | 8 +- netwerk/test/httpserver/test/head_utils.js | 5 - netwerk/test/unit/test_reopen.js | 4 - 6 files changed, 1144 insertions(+), 693 deletions(-) diff --git a/netwerk/test/httpserver/README b/netwerk/test/httpserver/README index 9e2d0b976c1b..d16b1b050c1d 100644 --- a/netwerk/test/httpserver/README +++ b/netwerk/test/httpserver/README @@ -78,6 +78,10 @@ calling server.stop() before the host application closes to ensure that all requests have completed. Things probably aren't going to break too horribly if you don't do this, but better safe than sorry. +MozJSHTTP makes no effort to time out requests, beyond any the socket itself +might or might not provide. I don't believe it provides any by default, but +I haven't verified this. + To be clear: the guarantee that nsIHttpServer.stop says implementations should make when possible (that .stop returns only when all pending requests have been serviced) cannot be made in a 1.8 environment; it can be made in a 1.9 diff --git a/netwerk/test/httpserver/TODO b/netwerk/test/httpserver/TODO index e21dbdbaa614..3a9546611776 100644 --- a/netwerk/test/httpserver/TODO +++ b/netwerk/test/httpserver/TODO @@ -5,11 +5,6 @@ Bugs to fix: a performance standpoint?) Ideas for future improvements: -- mod_cern_meta or Apache asis functionality (probably the former, since - asis+binary files looks annoying but is a definite want, and line endings are - likely a pain): - and - - add API to disable response buffering which, when called, causes errors when you try to do anything other than write to the body stream (i.e., modify headers or status line) once you've written anything to it -- useful when diff --git a/netwerk/test/httpserver/httpd.js b/netwerk/test/httpserver/httpd.js index c3d643288cf0..6e702a3e8aa7 100644 --- a/netwerk/test/httpserver/httpd.js +++ b/netwerk/test/httpserver/httpd.js @@ -81,6 +81,13 @@ function HttpError(code, description) this.code = code; this.description = description; } +HttpError.prototype = +{ + toString: function() + { + return this.code + " " + this.description; + } +}; /** * Errors thrown to trigger specific HTTP server responses. @@ -158,12 +165,30 @@ function dumpn(str) dump(str + "\n"); } +/** Dumps the current JS stack if DEBUG. */ +function dumpStack() +{ + // peel off the frames for dumpStack() and Error() + var stack = new Error().stack.split(/\n/).slice(2); + stack.forEach(dumpn); +} + + +/** The XPCOM thread manager. */ +var gThreadManager = null; + /** * JavaScript constructors for commonly-used classes; precreating these is a * speedup over doing the same from base principles. See the docs at * http://developer.mozilla.org/en/docs/Components.Constructor for details. */ +const ServerSocket = CC("@mozilla.org/network/server-socket;1", + "nsIServerSocket", + "init"); +const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1", + "nsIBinaryInputStream", + "setInputStream"); const Pipe = CC("@mozilla.org/pipe;1", "nsIPipe", "init"); @@ -173,6 +198,9 @@ const FileInputStream = CC("@mozilla.org/network/file-input-stream;1", const StreamCopier = CC("@mozilla.org/network/async-stream-copier;1", "nsIAsyncStreamCopier", "init"); +const Pump = CC("@mozilla.org/network/input-stream-pump;1", + "nsIInputStreamPump", + "init"); const ConverterInputStream = CC("@mozilla.org/intl/converter-input-stream;1", "nsIConverterInputStream", "init"); @@ -185,10 +213,10 @@ const SupportsString = CC("@mozilla.org/supports-string;1", /** * Returns the RFC 822/1123 representation of a date. * - * @param date + * @param date : Number * the date, in milliseconds from midnight (00:00:00), January 1, 1970 GMT - * @returns - * the string specifying the given date + * @returns string + * the representation of the given date */ function toDateString(date) { @@ -213,9 +241,9 @@ function toDateString(date) * Processes a date and returns the encoded UTC time as a string according to * the format specified in RFC 2616. * - * @param date - * the date as a JavaScript Date object - * @returns + * @param date : Date + * the date to process + * @returns string * a string of the form "HH:MM:SS", ranging from "00:00:00" to "23:59:59" */ function toTime(date) @@ -238,9 +266,9 @@ function toDateString(date) * Processes a date and returns the encoded UTC date as a string according to * the date1 format specified in RFC 2616. * - * @param date - * the date as a JavaScript Date object - * @returns + * @param date : Date + * the date to process + * @returns string * a string of the form "HH:MM:SS", ranging from "00:00:00" to "23:59:59" */ function toDate1(date) @@ -267,7 +295,7 @@ function toDateString(date) /** * Prints out a human-readable representation of the object o and its fields, * omitting those whose names begin with "_" if showMembers != true (to ignore - * hidden properties exposed via getters/setters). + * "private" properties exposed via getters/setters). */ function printObj(o, showMembers) { @@ -289,6 +317,9 @@ function printObj(o, showMembers) */ function nsHttpServer() { + if (!gThreadManager) + gThreadManager = Cc["@mozilla.org/thread-manager;1"].getService(); + /** The port on which this server listens. */ this._port = undefined; @@ -314,28 +345,51 @@ nsHttpServer.prototype = // NSISERVERSOCKETLISTENER /** - * This function signals that a new connection has been accepted. It is the - * method through which all requests must be handled, and by the end of this - * method any and all response requests must be sent. + * Processes an incoming request coming in on the given socket and contained + * in the given transport. * + * @param socket : nsIServerSocket + * the socket through which the request was served + * @param trans : nsISocketTransport + * the transport for the request/response * @see nsIServerSocketListener.onSocketAccepted */ - onSocketAccepted: function(serverSocket, trans) + onSocketAccepted: function(socket, trans) { + dumpn("*** onSocketAccepted(socket=" + socket + ", trans=" + trans + ") " + + "on thread " + gThreadManager.currentThread + + " (main is " + gThreadManager.mainThread + ")"); + dumpn(">>> new connection on " + trans.host + ":" + trans.port); - var input = trans.openInputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0); + const SEGMENT_SIZE = 8192; + const SEGMENT_COUNT = 1024; + var input = trans.openInputStream(0, SEGMENT_SIZE, SEGMENT_COUNT) + .QueryInterface(Ci.nsIAsyncInputStream); var output = trans.openOutputStream(Ci.nsITransport.OPEN_BLOCKING, 0, 0); - this._processConnection(serverSocket.port, input, output); + var conn = new Connection(input, output, this, socket.port); + var reader = new RequestReader(conn); + + // XXX add request timeout functionality here! + + // Note: must use main thread here, or we might get a GC that will cause + // threadsafety assertions. We really need to fix XPConnect so that + // you can actually do things in multi-threaded JS. :-( + input.asyncWait(reader, 0, 0, gThreadManager.mainThread); }, /** * Called when the socket associated with this is closed. * + * @param socket : nsIServerSocket + * the socket being closed + * @param status : nsresult + * the reason the socket stopped listening (NS_BINDING_ABORTED if the server + * was stopped using nsIHttpServer.stop) * @see nsIServerSocketListener.onStopListening */ - onStopListening: function(serverSocket, status) + onStopListening: function(socket, status) { dumpn(">>> shutting down server"); this._socketClosed = true; @@ -354,11 +408,9 @@ nsHttpServer.prototype = this._port = port; this._doQuit = this._socketClosed = false; - var socket = Cc["@mozilla.org/network/server-socket;1"] - .createInstance(Ci.nsIServerSocket); - socket.init(this._port, - true, // loopback only - -1); // default number of pending connections + var socket = new ServerSocket(this._port, + true, // loopback only + -1); // default number of pending connections dumpn(">>> listening on port " + socket.port); socket.asyncListen(this); @@ -378,18 +430,10 @@ nsHttpServer.prototype = this._socket = null; this._doQuit = false; - // spin an event loop and wait for the socket-close notification, if we can; - // this is only possible in Mozilla 1.9 code, but in situations where - // nothing really horrible happens at shutdown, nothing bad will happen in - // Mozilla 1.8-based code (and we want to support that) - if ("@mozilla.org/thread-manager;1" in Cc) - { - var thr = Cc["@mozilla.org/thread-manager;1"] - .getService() - .currentThread; - while (!this._socketClosed || this._handler.hasPendingRequests()) - thr.processNextEvent(true); - } + // spin an event loop and wait for the socket-close notification + var thr = gThreadManager.currentThread; + while (!this._socketClosed || this._handler.hasPendingRequests()) + thr.processNextEvent(true); }, // @@ -460,6 +504,7 @@ nsHttpServer.prototype = throw Cr.NS_ERROR_NO_INTERFACE; }, + // NON-XPCOM PUBLIC API /** @@ -471,75 +516,33 @@ nsHttpServer.prototype = { return this._socketClosed && !this._handler.hasPendingRequests(); }, + // PRIVATE IMPLEMENTATION /** - * Processes an incoming request in inStream served through the given port and - * writes the response to outStream. + * Closes the passed-in connection. * - * @param port - * the port on which the request was served - * @param inStream - * an nsIInputStream containing the incoming request - * @param outStream - * the nsIOutputStream to which the response should be written + * @param connection : Connection + * the connection to close */ - _processConnection: function(port, inStream, outStream) - { - try - { - var metadata = new RequestMetadata(port); - metadata.init(inStream); - - inStream.close(); - - this._handler.handleRequest(outStream, metadata); - } - catch (e) - { - dumpn(">>> internal error, shutting down server: " + e); - dumpn("*** stack trace: " + e.stack); - - inStream.close(); // in case we failed before then - - this._doQuit = true; - this._endConnection(this._handler, outStream); - } - - // stream cleanup, etc. happens in _endConnection below -- called from - // stream copier observer when all data has been copied - }, - - /** - * Closes the passed-in output stream and (if necessary) shuts down this - * server. - * - * @param handler - * the request handler which handled the request - * @param outStream - * the nsIOutputStream for the processed request which must be closed - */ - _endConnection: function(handler, outStream) + _endConnection: function(connection) { // // Order is important below: we must decrement handler._pendingRequests - // BEFORE calling this.stop(), if needed, because this.stop() returns only - // when the server socket's closed AND all pending requests are complete, - // which clearly isn't (and never will be) the case if it were the other way - // around + // BEFORE calling this.stop(), if needed, in connection.destroy(). + // this.stop() returns only when the server socket's closed AND all pending + // requests are complete, which clearly isn't (and never will be) the case + // if it were the other way around. // - outStream.close(); // inputstream already closed after processing - handler._pendingRequests--; + connection.close(); - // handle possible server quit -- note that this doesn't affect extant open - // connections and pending requests: nsIServerSocket.close is specified not - // to affect open connections, and nsIHttpServer.stop attempts to do its - // best to return only when the server socket is closed and all pending - // requests have been served - if (this._doQuit) - this.stop(); + NS_ASSERT(this == connection.server); + + this._handler._pendingRequests--; + + connection.destroy(); }, /** @@ -548,37 +551,715 @@ nsHttpServer.prototype = _requestQuit: function() { dumpn(">>> requesting a quit"); + dumpStack(); this._doQuit = true; } }; +/** + * Represents a connection to the server (and possibly in the future the thread + * on which the connection is processed). + * + * @param input : nsIInputStream + * stream from which incoming data on the connection is read + * @param output : nsIOutputStream + * stream to write data out the connection + * @param server : nsHttpServer + * the server handling the connection + * @param port : int + * the port on which the server is running + */ +function Connection(input, output, server, port) +{ + /** Stream of incoming data. */ + this.input = input; + + /** Stream for outgoing data. */ + this.output = output; + + /** The server associated with this request. */ + this.server = server; + + /** The port on which the server is running. */ + this.port = port; + + /** State variables for debugging. */ + this._closed = this._processed = false; +} +Connection.prototype = +{ + /** Closes this connection's input/output streams. */ + close: function() + { + this.input.close(); + this.output.close(); + this._closed = true; + }, + + /** + * Initiates processing of this connection, using the data in the given + * request. + * + * @param request : Request + * the request which should be processed + */ + process: function(request) + { + NS_ASSERT(!this._closed && !this._processed); + + this._processed = true; + + this.server._handler.handleResponse(this, request); + }, + + /** + * Initiates processing of this connection, generating a response with the + * given HTTP error code. + * + * @param code : uint + * an HTTP code, so in the range [0, 1000) + * @param metadata : Request + * incomplete data about the incoming request (since there were errors + * during its processing + */ + processError: function(code, metadata) + { + NS_ASSERT(!this._closed && !this._processed); + + this._processed = true; + + this.server._handler.handleError(code, this, metadata); + }, + + /** Ends this connection, destroying the resources it uses. */ + end: function() + { + this.server._endConnection(this); + }, + + /** Destroys resources used by this. */ + destroy: function() + { + if (!this._closed) + this.close(); + + // If an error triggered a server shutdown, act on it now + var server = this.server; + if (server._doQuit) + server.stop(); + } +}; + + + +/** Returns an array of count bytes from the given input stream. */ +function readBytes(inputStream, count) +{ + return new BinaryInputStream(inputStream).readByteArray(count); +} + + + +/** Request reader processing states; see RequestReader for details. */ +const READER_INITIAL = 0; +const READER_IN_HEADERS = 1; +const READER_IN_BODY = 2; + + +/** + * Reads incoming request data asynchronously, does any necessary preprocessing, + * and forwards it to the request handler. Processing occurs in three states: + * + * READER_INITIAL Haven't read the entire request line yet + * READER_IN_HEADERS Reading headers in the request + * READER_IN_BODY Finished reading all request headers (when body + * support's added, will be reading the body) + * + * During the first two stages, initial metadata about the request is gathered + * into a Request object. Once the status line and headers have been processed, + * we create a Response and hand it off to the ServerHandler to be given to the + * appropriate request handler. + * + * XXX we should set up a stream to provide lazy access to the request body + * + * @param connection : Connection + * the connection for the request being read + */ +function RequestReader(connection) +{ + /** Connection metadata for this request. */ + this._connection = connection; + + /** + * A container providing line-by-line access to the raw bytes that make up the + * data which has been read from the connection but has not yet been acted + * upon (by passing it to the request handler or by extracting request + * metadata from it). + */ + this._data = new LineData(); + + /** The current state of parsing the incoming request. */ + this._state = READER_INITIAL; + + /** Metadata constructed from the incoming request for the request handler. */ + this._metadata = new Request(connection.port); + + /** + * Used to preserve state if we run out of line data midway through a + * multi-line header. _lastHeaderName stores the name of the header, while + * _lastHeaderValue stores the value we've seen so far for the header. + * + * These fields are always either both undefined or both strings. + */ + this._lastHeaderName = this._lastHeaderValue = undefined; +} +RequestReader.prototype = +{ + // NSIINPUTSTREAMCALLBACK + + /** + * Called when more data from the incoming request is available. This method + * then reads the available data from input and deals with that data as + * necessary, depending upon the syntax of already-downloaded data. + * + * @param input : nsIAsyncInputStream + * the stream of incoming data from the connection + */ + onInputStreamReady: function(input) + { + dumpn("*** onInputStreamReady(input=" + input + ") on thread " + + gThreadManager.currentThread + " (main is " + + gThreadManager.mainThread + ")"); + dumpn("*** this._state == " + this._state); + + var count = input.available(); + + // Handle cases where we get more data after a request error has been + // discovered but *before* we can close the connection. + if (!this._data) + return; + + var moreAvailable = false; + + switch (this._state) + { + case READER_INITIAL: + moreAvailable = this._processRequestLine(input, count); + break; + + case READER_IN_HEADERS: + moreAvailable = this._processHeaders(input, count); + break; + + case READER_IN_BODY: + // XXX handle the request body! until then, just stop reading + break; + + default: + NS_ASSERT(false); + } + + if (moreAvailable) + input.asyncWait(this, 0, 0, gThreadManager.currentThread); + }, + + // + // see nsISupports.QueryInterface + // + QueryInterface: function(aIID) + { + if (aIID.equals(Ci.nsIInputStreamCallback) || + aIID.equals(Ci.nsISupports)) + return this; + + throw Cr.NS_ERROR_NO_INTERFACE; + }, + + + // PRIVATE API + + /** + * Reads count bytes from input and processes unprocessed, downloaded data as + * a request line. + * + * @param input : nsIInputStream + * stream from which count bytes of data must be read + * @param count : PRUint32 + * the number of bytes of data which must be read from input + * @returns boolean + * true if more data must be read from the request, false otherwise + */ + _processRequestLine: function(input, count) + { + NS_ASSERT(this._state == READER_INITIAL); + + var data = this._data; + data.appendBytes(readBytes(input, count)); + + + // servers SHOULD ignore any empty line(s) received where a Request-Line + // is expected (section 4.1) + var line = {}; + var readSuccess; + while ((readSuccess = data.readLine(line)) && line.value == "") + dumpn("*** ignoring beginning blank line..."); + + // if we don't have a full line, wait until we do + if (!readSuccess) + return true; + + // we have the first non-blank line + try + { + this._parseRequestLine(line.value); + + // do we have more header data to read? + if (!this._parseHeaders()) + return true; + + // headers complete, do a data check and then forward to the handler + this._validateRequest(); + return this._handleResponse(); + } + catch (e) + { + this._handleError(e); + return false; + } + }, + + /** + * Reads data from input and processes it, assuming it is either at the + * beginning or in the middle of processing request headers. + * + * @param input : nsIInputStream + * stream from which count bytes of data must be read + * @param count : PRUint32 + * the number of bytes of data which must be read from input + * @returns boolean + * true if more data must be read from the request, false otherwise + */ + _processHeaders: function(input, count) + { + NS_ASSERT(this._state == READER_IN_HEADERS); + + // XXX things to fix here: + // + // - need to support RFC 2047-encoded non-US-ASCII characters + // - really support absolute URLs (requires telling the server all its + // hostnames, beyond just localhost:port or 127.0.0.1:port) + + this._data.appendBytes(readBytes(input, count)); + + try + { + // do we have all the headers? + if (!this._parseHeaders()) + return true; + + // we have all the headers, continue with the body + this._validateRequest(); + return this._handleResponse(); + } + catch (e) + { + this._handleError(e); + return false; + } + }, + + /** + * Does various post-header checks on the data in this request. + * + * @throws : HttpError + * if the request was malformed in some way + */ + _validateRequest: function() + { + NS_ASSERT(this._state == READER_IN_BODY); + + dumpn("*** _validateRequest"); + + var metadata = this._metadata; + var headers = metadata._headers; + + var isHttp11 = metadata._httpVersion.equals(nsHttpVersion.HTTP_1_1); + + // 19.6.1.1 -- servers MUST report 400 to HTTP/1.1 requests w/o Host header + if (isHttp11 && !headers.hasHeader("Host")) + throw HTTP_400; + }, + + /** + * Handles responses in case of error, either in the server or in the request. + * + * @param e + * the specific error encountered, which is an HttpError in the case where + * the request is in some way invalid or cannot be fulfilled; if this isn't + * an HttpError we're going to be paranoid and shut down, because that + * shouldn't happen, ever + */ + _handleError: function(e) + { + var server = this._connection.server; + if (e instanceof HttpError) + { + var code = e.code; + } + else + { + // no idea what happened -- be paranoid and shut down + code = 500; + server._requestQuit(); + } + + // make attempted reuse of data an error + this._data = null; + + this._connection.processError(code, this._metadata); + }, + + /** + * Now that we've read the request line and headers, we can actually hand off + * the request to be handled. + * + * This method is called once per request, after the request line and all + * headers have been received. + * + * @returns boolean + * true if more data must be read, false otherwise + */ + _handleResponse: function() + { + NS_ASSERT(this._state == READER_IN_BODY); + + // XXX set up a stream for data in the request body here + + // We don't need the line-based data any more, so make attempted reuse an + // error. + this._data = null; + + this._connection.process(this._metadata); + + return false; + }, + + + // PARSING + + /** + * Parses the request line for the HTTP request associated with this. + * + * @param line : string + * the request line + */ + _parseRequestLine: function(line) + { + NS_ASSERT(this._state == READER_INITIAL); + + dumpn("*** _parseRequestLine('" + line + "')"); + + var metadata = this._metadata; + + // clients and servers SHOULD accept any amount of SP or HT characters + // between fields, even though only a single SP is required (section 19.3) + var request = line.split(/[ \t]+/); + if (!request || request.length != 3) + throw HTTP_400; + + metadata._method = request[0]; + + // get the HTTP version + var ver = request[2]; + var match = ver.match(/^HTTP\/(\d+\.\d+)$/); + if (!match) + throw HTTP_400; + + // determine HTTP version + try + { + metadata._httpVersion = new nsHttpVersion(match[1]); + if (!metadata._httpVersion.equals(nsHttpVersion.HTTP_1_0) && + !metadata._httpVersion.equals(nsHttpVersion.HTTP_1_1)) + throw "unsupported HTTP version"; + } + catch (e) + { + // we support HTTP/1.0 and HTTP/1.1 only + throw HTTP_501; + } + + + var fullPath = request[1]; + + if (fullPath.charAt(0) != "/") + { + // XXX we don't really support absolute URIs yet -- a MUST for HTTP/1.1; + // for now just get the path and use that, ignoring hostport + try + { + var uri = Cc["@mozilla.org/network/io-service;1"] + .getService(Ci.nsIIOService) + .newURI(fullPath, null, null); + fullPath = uri.path; + } + catch (e) { /* invalid URI */ } + if (fullPath.charAt(0) != "/") + { + this.errorCode = 400; + return; + } + } + + var splitter = fullPath.indexOf("?"); + if (splitter < 0) + { + // _queryString already set in ctor + metadata._path = fullPath; + } + else + { + metadata._path = fullPath.substring(0, splitter); + metadata._queryString = fullPath.substring(splitter + 1); + } + + // our work here is finished + this._state = READER_IN_HEADERS; + }, + + /** + * Parses all available HTTP headers in this until the header-ending CRLFCRLF, + * adding them to the store of headers in the request. + * + * @throws + * HTTP_400 if the headers are malformed + * @returns boolean + * true if all headers have now been processed, false otherwise + */ + _parseHeaders: function() + { + NS_ASSERT(this._state == READER_IN_HEADERS); + + dumpn("*** _parseHeaders"); + + var data = this._data; + + var headers = this._metadata._headers; + var lastName = this._lastHeaderName; + var lastVal = this._lastHeaderValue; + + var line = {}; + while (true) + { + NS_ASSERT(!((lastVal === undefined) ^ (lastName === undefined)), + lastName === undefined ? + "lastVal without lastName? lastVal: '" + lastVal + "'" : + "lastName without lastVal? lastName: '" + lastName + "'"); + + if (!data.readLine(line)) + { + // save any data we have from the header we might still be processing + this._lastHeaderName = lastName; + this._lastHeaderValue = lastVal; + return false; + } + + var lineText = line.value; + var firstChar = lineText.charAt(0); + + // blank line means end of headers + if (lineText == "") + { + // we're finished with the previous header + if (lastName) + { + try + { + headers.setHeader(lastName, lastVal, true); + } + catch (e) + { + dumpn("*** e == " + e); + throw HTTP_400; + } + } + else + { + // no headers in request -- valid for HTTP/1.0 requests + } + + // either way, we're done processing headers + this._state = READER_IN_BODY; + return true; + } + else if (firstChar == " " || firstChar == "\t") + { + // multi-line header if we've already seen a header line + if (!lastName) + { + // we don't have a header to continue! + throw HTTP_400; + } + + // append this line's text to the value; starts with SP/HT, so no need + // for separating whitespace + lastVal += lineText; + } + else + { + // we have a new header, so set the old one (if one existed) + if (lastName) + { + try + { + headers.setHeader(lastName, lastVal, true); + } + catch (e) + { + dumpn("*** e == " + e); + throw HTTP_400; + } + } + + var colon = lineText.indexOf(":"); // first colon must be splitter + if (colon < 1) + { + // no colon or missing header field-name + throw HTTP_400; + } + + // set header name, value (to be set in the next loop, usually) + lastName = lineText.substring(0, colon); + lastVal = lineText.substring(colon + 1); + } // empty, continuation, start of header + } // while (true) + } +}; + + +/** The character codes for CR and LF. */ +const CR = 0x0D, LF = 0x0A; + +/** + * Calculates the number of characters before the first CRLF pair in array, or + * -1 if the array contains no CRLF pair. + * + * @param array : Array + * an array of numbers in the range [0, 256), each representing a single + * character; the first CRLF is the lowest index i where + * |array[i] == "\r".charCodeAt(0)| and |array[i+1] == "\n".charCodeAt(0)|, + * if such an |i| exists, and -1 otherwise + * @returns int + * the index of the first CRLF if any were present, -1 otherwise + */ +function findCRLF(array) +{ + for (var i = array.indexOf(CR); i >= 0; i = array.indexOf(CR, i + 1)) + { + if (array[i + 1] == LF) + return i; + } + return -1; +} + + +/** + * A container which provides line-by-line access to the arrays of bytes with + * which it is seeded. + */ +function LineData() +{ + /** An array of queued bytes from which to get line-based characters. */ + this._data = []; +} +LineData.prototype = +{ + /** + * Appends the bytes in the given array to the internal data cache maintained + * by this. + */ + appendBytes: function(bytes) + { + Array.prototype.push.apply(this._data, bytes); + }, + + /** + * Removes and returns a line of data, delimited by CRLF, from this. + * + * @param out + * an object whose "value" property will be set to the first line of text + * present in this, sans CRLF, if this contains a full CRLF-delimited line + * of text; if this doesn't contain enough data, the value of the property + * is undefined + * @returns boolean + * true if a full line of data could be read from the data in this, false + * otherwise + */ + readLine: function(out) + { + var data = this._data; + var length = findCRLF(data); + if (length < 0) + return false; + + // + // We have the index of the CR, so remove all the characters, including + // CRLF, from the array with splice, and convert the removed array into the + // corresponding string, from which we then strip the trailing CRLF. + // + // Getting the line in this matter acknowledges that substring is an O(1) + // operation in SpiderMonkey because strings are immutable, whereas two + // splices, both from the beginning of the data, are less likely to be as + // cheap as a single splice plus two extra character conversions. + // + var line = String.fromCharCode.apply(null, data.splice(0, length + 2)); + out.value = line.substring(0, length); + + return true; + }, + + /** + * Retrieve any bytes we may have overread from the request's postdata. After + * this method is called, this must not be used in any way. + * + * @returns Array + * the bytes read past the CRLFCRLF at the end of request headers + */ + purge: function() + { + var data = this._data; + this._data = null; + return data; + } +}; + + + /** * Gets a content-type for the given file, as best as it is possible to do so. * - * @param file + * @param file : nsIFile * the nsIFile for which to get a file type - * @returns + * @returns string * the best content-type which can be determined for the file */ function getTypeFromFile(file) { try { - var type = Cc["@mozilla.org/uriloader/external-helper-app-service;1"] - .getService(Ci.nsIMIMEService) - .getTypeFromFile(file); + return Cc["@mozilla.org/uriloader/external-helper-app-service;1"] + .getService(Ci.nsIMIMEService) + .getTypeFromFile(file); } catch (e) { - type = "application/octet-stream"; + return "application/octet-stream"; } - return type; } - /** * Creates a request-handling function for an nsIHttpRequestHandler object. */ @@ -797,17 +1478,17 @@ function maybeAddHeaders(file, metadata, response) * support for HTTP error pages for various codes and fallback to HTTP 500 if * those codes fail for any reason. * - * @param srv - * the nsHttpServer in which this handler is being used + * @param server : nsHttpServer + * the server in which this handler is being used */ -function ServerHandler(srv) +function ServerHandler(server) { // FIELDS /** * The nsHttpServer instance associated with this handler. */ - this._server = srv; + this._server = server; /** * A variable used to ensure that all requests are fully complete before the @@ -831,7 +1512,7 @@ function ServerHandler(srv) * Custom request handlers for the server in which this resides. Path-handler * pairs are stored as property-value pairs in this property. * - * @see also ServerHandler.prototype._defaultPaths + * @see ServerHandler.prototype._defaultPaths */ this._overridePaths = {}; @@ -840,13 +1521,13 @@ function ServerHandler(srv) * resides. Path-handler pairs are stored as property-value pairs in this * property. * - * @see also ServerHandler.prototype._defaultErrors + * @see ServerHandler.prototype._defaultErrors */ this._overrideErrors = {}; /** - * Init our default handler for directories. The handler used to - * serve directories when no index file is present. + * The default handler for requests for directories, used to serve directories + * when no index file is present. */ this._indexHandler = defaultIndexHandler; } @@ -856,26 +1537,19 @@ ServerHandler.prototype = /** * Handles a request to this server, responding to the request appropriately - * and initiating server shutdown if necessary. If the request metadata - * specifies an error code, the appropriate error response will be sent. + * and initiating server shutdown if necessary. * - * @param outStream - * an nsIOutputStream to which a response should be written - * @param metadata + * This method never throws an exception. + * + * @param connection : Connection + * the connection for this request + * @param metadata : Request * request metadata as generated from the initial request */ - handleRequest: function(outStream, metadata) + handleResponse: function(connection, metadata) { var response = new Response(); - // handle any existing error codes - if (metadata.errorCode) - { - dumpn("*** errorCode == " + metadata.errorCode); - this._handleError(metadata, response); - return this._end(response, outStream); - } - var path = metadata.path; dumpn("*** path == " + path); @@ -894,8 +1568,12 @@ ServerHandler.prototype = { response.recycle(); - if (!(e instanceof HttpError) || e.code != 404) + if (!(e instanceof HttpError)) throw HTTP_500; + if (e.code != 404) + throw e; + + dumpn("*** default: " + (path in this._defaultPaths)); if (path in this._defaultPaths) this._defaultPaths[path](metadata, response); @@ -903,36 +1581,40 @@ ServerHandler.prototype = throw HTTP_404; } } - catch (e2) + catch (e) { - if (!(e2 instanceof HttpError)) + var errorCode = "internal"; + + try { - dumpn("*** internal error: e2 == " + e2); - throw e2; + if (!(e instanceof HttpError)) + throw e; + + errorCode = e.code; + dumpn("*** errorCode == " + errorCode); + + response.recycle(); + + this._handleError(errorCode, metadata, response); } + catch (e2) + { + dumpn("*** error handling " + errorCode + " error: " + + "e2 == " + e2 + ", shutting down server"); - var errorCode = e2.code; - dumpn("*** errorCode == " + errorCode); - - response.recycle(); - - metadata.errorCode = errorCode; - this._handleError(metadata, response); + response.destroy(); + connection.close(); + connection.server.stop(); + return; + } } - return this._end(response, outStream); + this._end(response, connection); }, - /** - * Associates a file with a server path so that it is returned by future - * requests to that path. - * - * @param path - * the path on the server, which must begin with a "/" - * @param file - * the nsILocalFile representing the file to be served; must not be a - * directory - */ + // + // see nsIHttpServer.registerFile + // registerFile: function(path, file) { dumpn("*** registering '" + path + "' as mapping to " + file.path); @@ -945,18 +1627,7 @@ ServerHandler.prototype = throw HTTP_404; response.setStatusLine(metadata.httpVersion, 200, "OK"); - - try - { - this._writeFileResponse(file, response); - } - catch (e) - { - // something happened -- but the calling code should handle the error - // and clean up the response - throw e; - } - + this._writeFileResponse(file, response); maybeAddHeaders(file, metadata, response); }; }, @@ -1028,12 +1699,26 @@ ServerHandler.prototype = this._indexHandler = handler; }, + // NON-XPCOM PUBLIC API + /** - * Set or remove a handler in an ojbect with a key. - * If handler is null, the key will be deleted. + * Returns true if this handler is in the middle of handling any current + * requests; this must be false before the server in which this is used may be + * safely shut down. + */ + hasPendingRequests: function() + { + return this._pendingRequests > 0; + }, + + + // PRIVATE API + + /** + * Sets or remove (if handler is null) a handler in an object with a key. * * @param handler - * A function or an nsIHttpRequestHandler object. + * a handler, either function or an nsIHttpRequestHandler * @param dict * The object to attach the handler to. * @param key @@ -1050,27 +1735,15 @@ ServerHandler.prototype = delete dict[key]; }, - /** - * Returns true if this handler is in the middle of handling any current - * requests; this must be false before the server in which this is used may be - * safely shut down. - */ - hasPendingRequests: function() - { - return this._pendingRequests > 0; - }, - - // PRIVATE API - /** * Handles a request which maps to a file in the local filesystem (if a base * path has already been set; otherwise the 404 error is thrown). * - * @param metadata - * request-related data as a RequestMetadata object - * @param response - * an uninitialized Response to the given request which must be initialized - * by a request handler + * @param metadata : Request + * metadata for the incoming request + * @param response : Response + * an uninitialized Response to the given request, to be initialized by a + * request handler * @throws HTTP_### * if an HTTP error occurred (usually HTTP_404); note that in this case the * calling code must handle cleanup of the response by calling .destroy() @@ -1078,54 +1751,47 @@ ServerHandler.prototype = */ _handleDefault: function(metadata, response) { - try + response.setStatusLine(metadata.httpVersion, 200, "OK"); + + var path = metadata.path; + NS_ASSERT(path.charAt(0) == "/", "invalid path: <" + path + ">"); + + // determine the actual on-disk file; this requires finding the deepest + // path-to-directory mapping in the requested URL + var file = this._getFileForPath(path); + + // the "file" might be a directory, in which case we either serve the + // contained index.html or make the index handler write the response + if (file.exists() && file.isDirectory()) { - response.setStatusLine(metadata.httpVersion, 200, "OK"); - - var path = metadata.path; - NS_ASSERT(path.charAt(0) == "/"); - - // determine the actual on-disk file; this requires finding the deepest - // path-to-directory mapping in the requested URL - var file = this._getFileForPath(path); - - // the "file" might be a directory, in which case we either serve the - // contained index.html or make the index handler write the response - if (file.exists() && file.isDirectory()) + file.append("index.html"); // make configurable? + if (!file.exists() || file.isDirectory()) { - file.append("index.html"); // make configurable? - if (!file.exists() || file.isDirectory()) - { - metadata._bag.setPropertyAsInterface("directory", file.parent); - this._indexHandler(metadata, response); - return; - } + metadata._ensurePropertyBag(); + metadata._bag.setPropertyAsInterface("directory", file.parent); + this._indexHandler(metadata, response); + return; } - - // alternately, the file might not exist - if (!file.exists()) - throw HTTP_404; - - // finally... - dumpn("*** handling '" + path + "' as mapping to " + file.path); - this._writeFileResponse(file, response); - - maybeAddHeaders(file, metadata, response); - } - catch (e) - { - // something failed, but make the calling code handle Response cleanup - throw e; } + + // alternately, the file might not exist + if (!file.exists()) + throw HTTP_404; + + // finally... + dumpn("*** handling '" + path + "' as mapping to " + file.path); + this._writeFileResponse(file, response); + + maybeAddHeaders(file, metadata, response); }, /** * Writes an HTTP response for the given file, including setting headers for * file metadata. * - * @param file + * @param file : nsILocalFile * the file which is to be sent in the response - * @param response + * @param response : Response * the response to which the file should be written */ _writeFileResponse: function(file, response) @@ -1152,13 +1818,14 @@ ServerHandler.prototype = * all registered path->directory mappings and any paths which are explicitly * overridden. * - * @returns - * the nsILocalFile which is to be sent as the response to a request for - * path + * @param path : string + * the server path for which a file should be retrieved, e.g. "/foo/bar" * @throws HttpError * when the correct action is the corresponding HTTP error (i.e., because no * mapping was found for a directory in path, the referenced file doesn't * exist, etc.) + * @returns nsILocalFile + * the file to be sent as the response to a request for the path */ _getFileForPath: function(path) { @@ -1237,27 +1904,55 @@ ServerHandler.prototype = return file; }, + /** + * Writes the error page for the given HTTP error code over the given + * connection. + * + * @param errorCode : uint + * the HTTP error code to be used + * @param connection : Connection + * the connection on which the error occurred + */ + handleError: function(errorCode, connection) + { + var response = new Response(); + + dumpn("*** error in request: " + errorCode); + + try + { + this._handleError(errorCode, new Request(connection.port), response); + this._end(response, connection); + } + catch (e) + { + connection.close(); + connection.server.stop(); + } + }, + /** * Handles a request which generates the given error code, using the * user-defined error handler if one has been set, gracefully falling back to * the x00 status code if the code has no handler, and failing to status code * 500 if all else fails. * - * @param metadata + * @param errorCode : uint + * the HTTP error which is to be returned + * @param metadata : Request * metadata for the request, which will often be incomplete since this is an - * error -- must have its .errorCode set for the desired error - * @param response + * error + * @param response : Response * an uninitialized Response should be initialized when this method * completes with information which represents the desired error code in the * ideal case or a fallback code in abnormal circumstances (i.e., 500 is a * fallback for 505, per HTTP specs) */ - _handleError: function(metadata, response) + _handleError: function(errorCode, metadata, response) { if (!metadata) throw Cr.NS_ERROR_NULL_POINTER; - var errorCode = metadata.errorCode; var errorX00 = errorCode - (errorCode % 100); try @@ -1324,167 +2019,182 @@ ServerHandler.prototype = * those headers and data, sends them to the HTTP client, and halts further * processing. It will also send a quit message to the server if necessary. * - * @param response - * a Response object representing the desired response - * @param outStream - * a stream to which the response should be written + * This method never throws an exception. + * + * @param response : Response + * the desired response + * @param connection : Connection + * the connection associated with the given response * @note * after completion, response must be considered "dead", and none of its * methods or properties may be accessed */ - _end: function(response, outStream) + _end: function(response, connection) { + // post-processing + response.setHeader("Connection", "close", false); + response.setHeader("Server", "MozJSHTTP", false); + response.setHeader("Date", toDateString(Date.now()), false); + + var bodyStream = response.bodyInputStream; + + // XXX suckage time! + // + // If the body of the response has had no data written to it (or has never + // been accessed -- same deal internally since we'll create one if we have + // to access bodyInputStream but have neither an input stream nor an + // output stream), the in-tree implementation of nsIPipe is such that + // when we try to close the pipe's output stream with no data in it, this + // is interpreted as an error and closing the output stream also closes + // the input stream. .available then throws, so we catch and deal as best + // as we can. + // + // Unfortunately, the easy alternative (substitute a storage stream for a + // pipe) also doesn't work. There's no problem writing zero bytes to the + // output end of the stream, but then attempting to get an input stream to + // read fails because the seek position must be strictly less than the + // buffer size. + // + // Much as I'd like the zero-byte body to be a mostly-unimportant problem, + // there are some HTTP responses such as 304 Not Modified which MUST have + // zero-byte bodies, so this *is* a necessary hack. try { - // post-processing - response.setHeader("Connection", "close", false); - response.setHeader("Server", "MozJSHTTP", false); - response.setHeader("Date", toDateString(Date.now()), false); - - var bodyStream = response.bodyInputStream - .QueryInterface(Ci.nsIInputStream); - - // XXX suckage time! - // - // If the body of the response has had no data written to it (or has never - // been accessed -- same deal internally since we'll create one if we have - // to access bodyInputStream but have neither an input stream nor an - // output stream), the in-tree implementation of nsIPipe is such that - // when we try to close the pipe's output stream with no data in it, this - // is interpreted as an error and closing the output stream also closes - // the input stream. .available then throws, so we catch and deal as best - // as we can. - // - // Unfortunately, the easy alternative (substitute a storage stream for a - // pipe) also doesn't work. There's no problem writing zero bytes to the - // output end of the stream, but then attempting to get an input stream to - // read fails because the seek position must be strictly less than the - // buffer size. - // - // Much as I'd like the zero-byte body to be a mostly-unimportant problem, - // there are some HTTP responses such as 304 Not Modified which MUST have - // zero-byte bodies, so this *is* a necessary hack. - try - { - var available = bodyStream.available(); - } - catch (e) - { - available = 0; - } - - response.setHeader("Content-Length", available.toString(), false); - - - // construct and send response - - // request-line - var preamble = "HTTP/" + response.httpVersion + " " + - response.httpCode + " " + - response.httpDescription + "\r\n"; - - // headers - var head = response.headers; - var headEnum = head.enumerator; - while (headEnum.hasMoreElements()) - { - var fieldName = headEnum.getNext() - .QueryInterface(Ci.nsISupportsString) - .data; - preamble += fieldName + ": " + head.getHeader(fieldName) + "\r\n"; - } - - // end request-line/headers - preamble += "\r\n"; - outStream.write(preamble, preamble.length); - - - // In certain situations, it's possible for us to have a race between - // the copy observer's onStopRequest and the listener for a channel - // opened to this server. Since we include a Content-Length header with - // every response, if the channel snarfs up all the data we promise, - // calls onStopRequest on the listener (and the server is shut down - // by that listener, causing the script to finish executing), and then - // tries to call onStopRequest on the copyObserver, we'll call into a - // scope with no Components and cause assertions *and* fail to close the - // connection properly. To combat this, during server shutdown we delay - // full shutdown until any pending requests are fully copied using this - // property on the server handler. We increment before (possibly) - // starting the copy observer and decrement when the copy completes, - // ensuring that all copies complete before the server fully shuts down. - // - // We do this for every request primarily to simplify maintenance of this - // property (and also because it's less fragile when we can remove the - // zero-sized body hack used above). - this._pendingRequests++; - - // If we have a body, send it -- if we don't, then don't bother with a - // heavyweight async copy which doesn't need to happen and just do - // response post-processing (usually handled by the copy observer) - // directly - if (available != 0) - { - // local references for use in the copy observer - var server = this._server; - var handler = this; - - /** - * Observer of the copying of data from the body stream generated by a - * request handler to the output stream for the server socket. It - * handles all post-request-writing cleanup details, such as closing - * open streams and shutting down the server in case of errors. - */ - var copyObserver = - { - onStartRequest: function(request, context) { /* don't care */ }, - - /** - * Called when the async stream copy completes. This is place where - * final cleanup should occur, including stream closures and - * response destruction. Note that errors which are detected here - * should still shut down the server, for safety. - */ - onStopRequest: function(request, context, statusCode) - { - // if something bad happened during the copy, be paranoid - if (!Components.isSuccessCode(statusCode)) - server._requestQuit(); - - // we're completely finished with this response - response.destroy(); - - server._endConnection(handler, outStream); - }, - - QueryInterface: function(aIID) - { - if (aIID.equals(Ci.nsIRequestObserver) || - aIID.equals(Ci.nsISupports)) - return this; - - throw Cr.NS_ERROR_NO_INTERFACE; - } - }; - - - // body -- written async, because pipes deadlock if we do - // |outStream.writeFrom(bodyStream, bodyStream.available());| - var copier = new StreamCopier(bodyStream, outStream, null, - true, true, 8192); - copier.asyncCopy(copyObserver, null); - } - else - { - // finished with the response -- destroy - response.destroy(); - this._server._endConnection(this, outStream); - } + var available = bodyStream.available(); } catch (e) { - // something bad happened -- throw and make calling code deal with the - // response given to us - throw e; + available = 0; + } + + response.setHeader("Content-Length", available.toString(), false); + + + // construct and send response + + // request-line + var preamble = "HTTP/" + response.httpVersion + " " + + response.httpCode + " " + + response.httpDescription + "\r\n"; + + // headers + var head = response.headers; + var headEnum = head.enumerator; + while (headEnum.hasMoreElements()) + { + var fieldName = headEnum.getNext() + .QueryInterface(Ci.nsISupportsString) + .data; + preamble += fieldName + ": " + head.getHeader(fieldName) + "\r\n"; + } + + // end request-line/headers + preamble += "\r\n"; + + var outStream = connection.output; + try + { + outStream.write(preamble, preamble.length); + } + catch (e) + { + // Connection closed already? Even if not, failure to write the response + // means we probably will fail later anyway, so in the interests of + // avoiding exceptions we'll (possibly) close the connection and return. + response.destroy(); + connection.close(); + return; + } + + // In certain situations, it's possible for us to have a race between + // the copy observer's onStopRequest and the listener for a channel + // opened to this server. Since we include a Content-Length header with + // every response, if the channel snarfs up all the data we promise, + // calls onStopRequest on the listener (and the server is shut down + // by that listener, causing the script to finish executing), and then + // tries to call onStopRequest on the copyObserver, we'll call into a + // scope with no Components and cause assertions *and* fail to close the + // connection properly. To combat this, during server shutdown we delay + // full shutdown until any pending requests are fully copied using this + // property on the server handler. We increment before (possibly) + // starting the copy observer and decrement when the copy completes, + // ensuring that all copies complete before the server fully shuts down. + // + // We do this for every request primarily to simplify maintenance of this + // property (and also because it's less fragile when we can remove the + // zero-sized body hack used above). + this._pendingRequests++; + + var server = this._server; + + // If we have a body, send it -- if we don't, then don't bother with a + // heavyweight async copy which doesn't need to happen and just do + // response post-processing (usually handled by the copy observer) + // directly + if (available != 0) + { + /** + * Observer of the copying of data from the body stream generated by a + * request handler to the output stream for the server socket. It + * handles all post-request-writing cleanup details, such as closing + * open streams and shutting down the server in case of errors. + */ + var copyObserver = + { + onStartRequest: function(request, context) { /* don't care */ }, + + /** + * Called when the async stream copy completes. This is place where + * final cleanup should occur, including stream closures and + * response destruction. Note that errors which are detected here + * should still shut down the server, for safety. + */ + onStopRequest: function(request, cx, statusCode) + { + // statusCode can indicate user-triggered failures (e.g. if the user + // closes the connection during the copy, which would cause a status + // of NS_ERROR_NET_RESET), so don't treat its value being an error + // code as catastrophic. I can create this situation when running + // Mochitests in a debug build by clicking the Stop button during + // test execution, but it's not exactly a surefire way to reproduce + // the problem. + if (!Components.isSuccessCode(statusCode)) + { + dumpn("*** WARNING: non-success statusCode in onStopRequest: " + + statusCode); + } + + // we're completely finished with this response + response.destroy(); + + connection.end(); + }, + + QueryInterface: function(aIID) + { + if (aIID.equals(Ci.nsIRequestObserver) || + aIID.equals(Ci.nsISupports)) + return this; + + throw Cr.NS_ERROR_NO_INTERFACE; + } + }; + + + // + // Now write out the body, async since we might be serving this to + // ourselves on the same thread, and writing too much data would deadlock. + // + var copier = new StreamCopier(bodyStream, outStream, + null, + true, true, 8192); + copier.asyncCopy(copyObserver, null); + } + else + { + // finished with the response -- destroy + response.destroy(); + this._server._endConnection(connection); } }, @@ -1617,7 +2327,7 @@ ServerHandler.prototype = if (metadata.queryString) body += "?" + metadata.queryString; - body += " HTTP/" + metadata.httpVersion + "\n"; + body += " HTTP/" + metadata.httpVersion + "\r\n"; var headEnum = metadata.headers; while (headEnum.hasMoreElements()) @@ -1625,7 +2335,7 @@ ServerHandler.prototype = var fieldName = headEnum.getNext() .QueryInterface(Ci.nsISupportsString) .data; - body += fieldName + ": " + metadata.getHeader(fieldName) + "\n"; + body += fieldName + ": " + metadata.getHeader(fieldName) + "\r\n"; } response.bodyOutputStream.write(body, body.length); @@ -1649,6 +2359,11 @@ FileMap.prototype = /** * Maps key to a clone of the nsILocalFile value if value is non-null; * otherwise, removes any extant mapping for key. + * + * @param key : string + * string to which a clone of value is mapped + * @param value : nsILocalFile + * the file to map to key, or null to remove a mapping */ put: function(key, value) { @@ -1661,6 +2376,11 @@ FileMap.prototype = /** * Returns a clone of the nsILocalFile mapped to key, or null if no such * mapping exists. + * + * @param key : string + * key to which the returned file maps + * @returns nsILocalFile + * a clone of the mapped file, or null if no mapping exists */ get: function(key) { @@ -1704,9 +2424,9 @@ const IS_TOKEN_ARRAY = /** * Determines whether the given character code is a CTL. * - * @param code + * @param code : uint * the character code - * @returns + * @returns boolean * true if code is a CTL, false otherwise */ function isCTL(code) @@ -2003,7 +2723,7 @@ const headerUtils = * * @throws NS_ERROR_INVALID_ARG * if fieldName does not match the field-name production in RFC 2616 - * @returns + * @returns string * fieldName converted to lowercase if it is a valid header, for characters * where case conversion is possible */ @@ -2030,11 +2750,11 @@ const headerUtils = * part of the HTTP protocol), normalizes the value if it is, and * returns the normalized value. * - * @param fieldValue + * @param fieldValue : string * a value to be normalized as an HTTP header field value * @throws NS_ERROR_INVALID_ARG * if fieldValue does not match the field-value production in RFC 2616 - * @returns + * @returns string * fieldValue as a normalized HTTP header field value */ normalizeFieldValue: function(fieldValue) @@ -2078,9 +2798,9 @@ const headerUtils = * Converts the given string into a string which is safe for use in an HTML * context. * - * @param str + * @param str : string * the string to make HTML-safe - * @returns + * @returns string * an HTML-safe version of str */ function htmlEscape(str) @@ -2108,24 +2828,18 @@ function nsHttpVersion(versionString) if (!matches) throw "Not a valid HTTP version!"; + /** The major version number of this, as a number. */ this.major = parseInt(matches[1], 10); + + /** The minor version number of this, as a number. */ this.minor = parseInt(matches[2], 10); + if (isNaN(this.major) || isNaN(this.minor) || this.major < 0 || this.minor < 0) throw "Not a valid HTTP version!"; } nsHttpVersion.prototype = { - /** - * The major version number of this, as a number - */ - major: undefined, - - /** - * The minor version number of this, as a number. - */ - minor: undefined, - /** * Returns the standard string representation of the HTTP version represented * by this (e.g., "1.1"). @@ -2138,6 +2852,9 @@ nsHttpVersion.prototype = /** * Returns true if this represents the same HTTP version as otherVersion, * false otherwise. + * + * @param otherVersion : nsHttpVersion + * the version to compare against this */ equals: function (otherVersion) { @@ -2180,9 +2897,9 @@ nsHttpHeaders.prototype = /** * Sets the header represented by name and value in this. * - * @param name + * @param name : string * the header name - * @param value + * @param value : string * the header value * @throws NS_ERROR_INVALID_ARG * if name or value is not a valid header component @@ -2201,14 +2918,14 @@ nsHttpHeaders.prototype = /** * Returns the value for the header specified by this. * - * @returns - * the field value for the given header, possibly with non-semantic changes - * (i.e., leading/trailing whitespace stripped, whitespace runs replaced - * with spaces, etc.) at the option of the implementation * @throws NS_ERROR_INVALID_ARG * if fieldName does not constitute a valid header field name * @throws NS_ERROR_NOT_AVAILABLE * if the given header does not exist in this + * @returns string + * the field value for the given header, possibly with non-semantic changes + * (i.e., leading/trailing whitespace stripped, whitespace runs replaced + * with spaces, etc.) at the option of the implementation */ getHeader: function(fieldName) { @@ -2224,10 +2941,12 @@ nsHttpHeaders.prototype = * Returns true if a header with the given field name exists in this, false * otherwise. * - * @param fieldName + * @param fieldName : string * the field name whose existence is to be determined in this * @throws NS_ERROR_INVALID_ARG * if fieldName does not constitute a valid header field name + * @returns boolean + * true if the header's present, false otherwise */ hasHeader: function(fieldName) { @@ -2259,8 +2978,8 @@ nsHttpHeaders.prototype = /** * Constructs an nsISimpleEnumerator for the given array of items. * - * @param items - * the array of items, which must all implement nsISupports + * @param items : Array + * the items, which must all implement nsISupports */ function nsSimpleEnumerator(items) { @@ -2292,22 +3011,19 @@ nsSimpleEnumerator.prototype = /** - * Parses a server request into a set of metadata, so far as is possible. Any - * detected errors will result in this.errorCode being set to an HTTP error code - * value. Users MUST check this value after creation and any external - * initialization of RequestMetadata objects to ensure that errors are handled - * correctly. + * A representation of the data in an HTTP request. * - * @param port + * @param port : uint * the port on which the server receiving this request runs */ -function RequestMetadata(port) +function Request(port) { this._method = ""; this._path = ""; this._queryString = ""; this._host = ""; this._port = port; + this._host = "localhost"; // XXX or from environment or server itself? /** * The headers in this request. @@ -2315,20 +3031,13 @@ function RequestMetadata(port) this._headers = new nsHttpHeaders(); /** - * For the addition of ad-hoc properties and new functionality - * without having to tweak nsIHttpRequestMetadata every time. + * For the addition of ad-hoc properties and new functionality without having + * to change nsIHttpRequestMetadata every time; currently lazily created, + * as its only use is in directory listings. */ - this._bag = new WritablePropertyBag(); - - /** - * The numeric HTTP error, if any, associated with this request. This value - * may be set by the constructor but is usually only set by the handler after - * this has been constructed. After this has been initialized, this value - * MUST be checked for errors. - */ - this.errorCode = 0; + this._bag = null; } -RequestMetadata.prototype = +Request.prototype = { // SERVER METADATA @@ -2413,6 +3122,7 @@ RequestMetadata.prototype = // get enumerator() { + this._ensurePropertyBag(); return this._bag.enumerator; }, @@ -2421,262 +3131,15 @@ RequestMetadata.prototype = // getProperty: function(name) { + this._ensurePropertyBag(); return this._bag.getProperty(name); }, - - // ENTITY - - /** - * An input stream which contains the body of this request. - */ - get bodyStream() + + /** Ensures a property bag has been created for ad-hoc behaviors. */ + _ensurePropertyBag: function() { - // we want this once we do real request processing -- expose externally when - // we do this - return null; - }, - - // PUBLIC CONSTRUCTION API - - /** - * The HTTP error code which should be the result of this request. It must be - * checked whenever other API documentation says it should be checked. - */ - errorCode: 0, - - // INITIALIZATION - init: function(input) - { - // XXX this is incredibly un-RFC2616 in every possible way: - // - // - accepts non-CRLF line endings - // - no real testing for non-US-ASCII text and throwing in that case - // - handles POSTs by displaying the URL and throwing away the request - // entity - // - need to support RFC 2047-encoded non-US-ASCII characters - // - really support absolute URLs (requires telling the server its hostname, - // beyond just localhost:port and 127.0.0.1:port), not just pretend we - // serve every request that's given to us regardless of the server - // hostname and port - // - etc. - - // read the input line by line; the first line either tells us the requested - // path or is empty, in which case the second line contains the path - var lis = new ConverterInputStream(input, "ISO-8859-1", 1024, 0xFFFD); - lis.QueryInterface(Ci.nsIUnicharLineInputStream); - - - this._parseRequestLine(lis); - if (this.errorCode) - return; - - this._parseHeaders(lis); - if (this.errorCode) - return; - - // XXX need to put body transmitted with this request into an input stream! - - // 19.6.1.1 -- servers MUST report 400 to HTTP/1.1 requests w/o Host header - if (!this._headers.hasHeader("Host") && - this._httpVersion.equals(nsHttpVersion.HTTP_1_1)) - { - this.errorCode = 400; - return; - } - - // XXX set this based on Host or the request URI? - this._host = "localhost"; - }, - - // PRIVATE API - - /** - * Parses the request line for the HTTP request in the given input stream. On - * completion this.errorCode must be checked to determine whether any errors - * occurred during header parsing. - * - * @param lis - * an nsIUnicharLineInputStream from which to parse HTTP headers - */ - _parseRequestLine: function(lis) - { - // servers SHOULD ignore any empty line(s) received where a Request-Line - // is expected (section 4.1) - var line = {}; - while (lis.readLine(line) && line.value == "") - dumpn("*** ignoring beginning blank line..."); - - // clients and servers SHOULD accept any amount of SP or HT characters - // between fields, even though only a single SP is required (section 19.3) - var request = line.value.split(/[ \t]+/); - if (!request || request.length != 3) - { - this.errorCode = 400; - return; - } - - this._method = request[0]; - - // check the HTTP version - var ver = request[2]; - var match = ver.match(/^HTTP\/(\d+\.\d+)$/); - if (!match) - { - this.errorCode = 400; - return; - } - - // reject unrecognized methods - if (request[0] != "GET" && request[0] != "POST") - { - this.errorCode = 501; - return; - } - - // determine HTTP version - try - { - this._httpVersion = new nsHttpVersion(match[1]); - if (!this._httpVersion.equals(nsHttpVersion.HTTP_1_0) && - !this._httpVersion.equals(nsHttpVersion.HTTP_1_1)) - throw "unsupported HTTP version"; - } - catch (e) - { - // we support HTTP/1.0 and HTTP/1.1 only - this.errorCode = 501; - return; - } - - var fullPath = request[1]; - - if (fullPath.charAt(0) != "/") - { - // XXX we don't support absolute URIs yet -- a MUST for HTTP/1.1; - // for now just get the path and use that, ignoring hostport - try - { - var uri = Cc["@mozilla.org/network/io-service;1"] - .getService(Ci.nsIIOService) - .newURI(fullPath, null, null); - fullPath = uri.path; - } - catch (e) { /* invalid URI */ } - if (fullPath.charAt(0) != "/") - { - this.errorCode = 400; - return; - } - } - - var splitter = fullPath.indexOf("?"); - if (splitter < 0) - { - // _queryString already set in ctor - this._path = fullPath; - } - else - { - this._path = fullPath.substring(0, splitter); - this._queryString = fullPath.substring(splitter + 1); - } - }, - - /** - * Parses all available HTTP headers from the given input stream. On - * completion, this.errorCode must be checked to determine whether any errors - * occurred during header parsing. - * - * @param lis - * the nsIUnicharLineInputStream from which to parse HTTP headers - */ - _parseHeaders: function(lis) - { - var headers = this._headers; - var lastName, lastVal; - - var line = {}; - while (true) - { - NS_ASSERT((lastVal === undefined && lastName === undefined) || - (lastVal !== undefined && lastName !== undefined), - lastName === undefined ? - "lastVal without lastName? lastVal: '" + lastVal + "'" : - "lastName without lastVal? lastName: '" + lastName + "'"); - - lis.readLine(line); - var lineText = line.value; - var firstChar = lineText.charAt(0); - - // blank line means end of headers - if (lineText == "") - { - // we're finished with the previous header - if (lastName) - { - try - { - headers.setHeader(lastName, lastVal, true); - } - catch (e) - { - dumpn("*** e == " + e); - this.errorCode = 400; - return; - } - } - else - { - // no headers in request -- valid for HTTP/1.0 requests - } - - // either way, we're done processing headers - break; - } - else if (firstChar == " " || firstChar == "\t") - { - // multi-line header if we've seen a header line - if (!lastName) - { - // we don't have a header to continue! - this.errorCode = 400; - return; - } - - // append this line's text to the value; starts with SP/HT, so no need - // for separating whitespace - lastVal += lineText; - } - else - { - // we have a new header, so set the old one (if one existed) - if (lastName) - { - try - { - headers.setHeader(lastName, lastVal, true); - } - catch (e) - { - dumpn("*** e == " + e); - this.errorCode = 400; - return; - } - } - - var colon = lineText.indexOf(":"); // first colon must be splitter - if (colon < 1) - { - // no colon or missing header field-name - this.errorCode = 400; - return; - } - - // set header name, value (to be set in the next loop, usually) - lastName = lineText.substring(0, colon); - lastVal = lineText.substring(colon + 1); - } // empty, continuation, start of header - } // while (true) + if (!this._bag) + this._bag = new WritablePropertyBag(); } }; @@ -2826,9 +3289,7 @@ function server(port, basePath) srv.registerDirectory("/", lp); srv.start(port); - var thread = Cc["@mozilla.org/thread-manager;1"] - .getService() - .currentThread; + var thread = gThreadManager.currentThread; while (!srv.isStopped()) thread.processNextEvent(true); diff --git a/netwerk/test/httpserver/nsIHttpServer.idl b/netwerk/test/httpserver/nsIHttpServer.idl index 54a0f636810b..4b14c10abdb4 100644 --- a/netwerk/test/httpserver/nsIHttpServer.idl +++ b/netwerk/test/httpserver/nsIHttpServer.idl @@ -272,13 +272,13 @@ interface nsIHttpRequestMetadata : nsIPropertyBag boolean hasHeader(in string fieldName); /** - * An nsISimpleEnumerator over the names of the headers in this request. The - * header field names in the enumerator may not necessarily have the same case - * as they do in the request itself. + * An nsISimpleEnumerator of nsISupportsStrings over the names of the headers + * in this request. The header field names in the enumerator may not + * necessarily have the same case as they do in the request itself. */ readonly attribute nsISimpleEnumerator headers; - // XXX should expose body of request here! + // XXX expose request body here! }; diff --git a/netwerk/test/httpserver/test/head_utils.js b/netwerk/test/httpserver/test/head_utils.js index 2b5d1fb8c009..16ce16f5186d 100644 --- a/netwerk/test/httpserver/test/head_utils.js +++ b/netwerk/test/httpserver/test/head_utils.js @@ -41,11 +41,6 @@ do_import_script("netwerk/test/httpserver/httpd.js"); // if these tests fail, we'll want the debug output DEBUG = true; -// XPCOM constructor shorthands -const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1", - "nsIBinaryInputStream", - "setInputStream"); - /** * Constructs a new nsHttpServer instance. This function is intended to diff --git a/netwerk/test/unit/test_reopen.js b/netwerk/test/unit/test_reopen.js index 0ebb3752281a..b05cc3bc2e96 100644 --- a/netwerk/test/unit/test_reopen.js +++ b/netwerk/test/unit/test_reopen.js @@ -21,10 +21,6 @@ var test_array = [ // Utility functions -var BinaryInputStream = - Components.Constructor("@mozilla.org/binaryinputstream;1", - "nsIBinaryInputStream", "setInputStream"); - function makeChan(url) { var ios = Cc["@mozilla.org/network/io-service;1"] .getService(Ci.nsIIOService); From ec4b6676fef3962b35e6ad13f0e4651545cf79b7 Mon Sep 17 00:00:00 2001 From: "enndeakin@sympatico.ca" Date: Thu, 23 Aug 2007 15:13:42 -0700 Subject: [PATCH 362/368] Bug 392512, panel doesn't open when opened from a menu, r+sr=bz,a=dbaron --- layout/xul/base/src/nsXULPopupManager.cpp | 63 +++++++++++---- toolkit/content/tests/widgets/Makefile.in | 1 + .../tests/widgets/test_panelfrommenu.xul | 80 +++++++++++++++++++ 3 files changed, 127 insertions(+), 17 deletions(-) create mode 100644 toolkit/content/tests/widgets/test_panelfrommenu.xul diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp index 6877e9c1b1e5..079f100db4b2 100644 --- a/layout/xul/base/src/nsXULPopupManager.cpp +++ b/layout/xul/base/src/nsXULPopupManager.cpp @@ -517,29 +517,44 @@ nsXULPopupManager::HidePopup(nsIContent* aPopup, PRBool deselectMenu = PR_FALSE; nsCOMPtr popupToHide, nextPopup, lastPopup; if (foundMenu) { - // at this point, item will be set to the found item in the list. If item - // is the topmost menu, the one to remove, then there are no other - // popups to hide. If item is not the topmost menu, then there are + // at this point, foundMenu will be set to the found item in the list. If + // foundMenu is the topmost menu, the one to remove, then there are no other + // popups to hide. If foundMenu is not the topmost menu, then there may be // open submenus below it. In this case, we need to make sure that those - // submenus are closed up first. To do this, we start at mCurrentMenu and - // close that popup. In synchronous mode, the FirePopupHidingEvent method - // will be called which in turn calls HidePopupCallback to close up the - // next popup in the chain. These two methods will be called in sequence - // recursively to close up all the necessary popups. In asynchronous mode, - // a similar process occurs except that the FirePopupHidingEvent method is - // called asynchrounsly. In either case, nextPopup is set to the content - // node of the next popup to close, and lastPopup is set to the last popup - // in the chain to close, which will be aPopup. + // submenus are closed up first. To do this, we scan up the menu list to + // find the topmost popup with only menus between it and foundMenu and + // close that menu first. In synchronous mode, the FirePopupHidingEvent + // method will be called which in turn calls HidePopupCallback to close up + // the next popup in the chain. These two methods will be called in + // sequence recursively to close up all the necessary popups. In + // asynchronous mode, a similar process occurs except that the + // FirePopupHidingEvent method is called asynchrounsly. In either case, + // nextPopup is set to the content node of the next popup to close, and + // lastPopup is set to the last popup in the chain to close, which will be + // aPopup, or null to close up all menus. + + nsMenuChainItem* topMenu = foundMenu; + // Use IsMenu to ensure that foundMenu is a menu and scan down the child + // list until a non-menu is found. If foundMenu isn't a menu at all, don't + // scan and just close up this menu. + if (foundMenu->IsMenu()) { + item = topMenu->GetChild(); + while (item && item->IsMenu()) { + topMenu = item; + item = item->GetChild(); + } + } + deselectMenu = aDeselectMenu; - popupToHide = mCurrentMenu->Content(); - popupFrame = mCurrentMenu->Frame(); + popupToHide = topMenu->Content(); + popupFrame = topMenu->Frame(); type = popupFrame->PopupType(); - nsMenuChainItem* parent = mCurrentMenu->GetParent(); + nsMenuChainItem* parent = topMenu->GetParent(); // close up another popup if there is one, and we are either hiding the // entire chain or the item to hide isn't the topmost popup. - if (parent && (aHideChain || mCurrentMenu != item)) + if (parent && (aHideChain || topMenu != foundMenu)) nextPopup = parent->Content(); lastPopup = aHideChain ? nsnull : aPopup; @@ -1794,8 +1809,21 @@ nsXULMenuCommandEvent::Run() // associated view manager on exit from this function. // See bug 54233. // XXXndeakin is this still needed? + + nsCOMPtr popup; nsMenuFrame* menuFrame = pm->GetMenuFrameForContent(mMenu); if (menuFrame) { + // Find the popup that the menu is inside. Below, this popup will + // need to be hidden. + nsIFrame* popupFrame = menuFrame->GetParent(); + while (popupFrame) { + if (popupFrame->GetType() == nsGkAtoms::menuPopupFrame) { + popup = popupFrame->GetContent(); + break; + } + popupFrame = popupFrame->GetParent(); + } + nsPresContext* presContext = menuFrame->PresContext(); nsCOMPtr kungFuDeathGrip = presContext->GetViewManager(); nsCOMPtr shell = presContext->PresShell(); @@ -1814,7 +1842,8 @@ nsXULMenuCommandEvent::Run() shell->HandleDOMEventWithTarget(mMenu, &commandEvent, &status); } - pm->Rollup(); + if (popup) + pm->HidePopup(popup, PR_TRUE, PR_TRUE, PR_TRUE); return NS_OK; } diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in index e4833270881c..1fc9f02d61d7 100644 --- a/toolkit/content/tests/widgets/Makefile.in +++ b/toolkit/content/tests/widgets/Makefile.in @@ -68,6 +68,7 @@ _TEST_FILES = test_bug360220.xul \ test_datepicker.xul \ test_timepicker.xul \ xul_selectcontrol.js \ + test_panelfrommenu.xul \ test_hiddenitems.xul \ test_hiddenpaging.xul \ $(NULL) diff --git a/toolkit/content/tests/widgets/test_panelfrommenu.xul b/toolkit/content/tests/widgets/test_panelfrommenu.xul new file mode 100644 index 000000000000..86063a671762 --- /dev/null +++ b/toolkit/content/tests/widgets/test_panelfrommenu.xul @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +

+

+ +
+
+ + + From e1089f9499e480585e6b528ab930a080e4c454ba Mon Sep 17 00:00:00 2001 From: "dietrich@mozilla.com" Date: Thu, 23 Aug 2007 15:24:34 -0700 Subject: [PATCH 363/368] Bug 382639 bookmark toolbar change not reflected in UI (for stevewon@gmail.com, r=dietrich) --- browser/components/places/content/utils.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/browser/components/places/content/utils.js b/browser/components/places/content/utils.js index aa47158cc03f..b6b5d505ca42 100644 --- a/browser/components/places/content/utils.js +++ b/browser/components/places/content/utils.js @@ -1449,10 +1449,7 @@ var PlacesUtils = { }, get toolbarFolderId() { - if (!("_toolbarFolderId" in this)) - this._toolbarFolderId = this.bookmarks.toolbarFolder; - - return this._toolbarFolderId; + return this.bookmarks.toolbarFolder; }, get tagRootId() { From f7acaf504c1f64135d232681a5e0b17415b506e0 Mon Sep 17 00:00:00 2001 From: "sspitzer@mozilla.org" Date: Thu, 23 Aug 2007 15:26:11 -0700 Subject: [PATCH 364/368] fix for bug #393223: annotations expired too early r=dietrich --- .../places/src/nsNavHistoryExpire.cpp | 6 +- .../places/tests/unit/test_expiration.js | 95 +++++++++++++++++-- 2 files changed, 92 insertions(+), 9 deletions(-) diff --git a/toolkit/components/places/src/nsNavHistoryExpire.cpp b/toolkit/components/places/src/nsNavHistoryExpire.cpp index 1eee5d9412b5..594d4d398bba 100644 --- a/toolkit/components/places/src/nsNavHistoryExpire.cpp +++ b/toolkit/components/places/src/nsNavHistoryExpire.cpp @@ -86,9 +86,9 @@ struct nsNavHistoryExpireRecord { #define MAX_SEQUENTIAL_RUNS 1 // Expiration policy amounts (in microseconds) -const PRTime EXPIRATION_POLICY_DAYS = (7 * 86400 * PR_MSEC_PER_SEC); -const PRTime EXPIRATION_POLICY_WEEKS = (30 * 86400 * PR_MSEC_PER_SEC); -const PRTime EXPIRATION_POLICY_MONTHS = ((PRTime)180 * 86400 * PR_MSEC_PER_SEC); +const PRTime EXPIRATION_POLICY_DAYS = ((PRTime)7 * 86400 * PR_USEC_PER_SEC); +const PRTime EXPIRATION_POLICY_WEEKS = ((PRTime)30 * 86400 * PR_USEC_PER_SEC); +const PRTime EXPIRATION_POLICY_MONTHS = ((PRTime)180 * 86400 * PR_USEC_PER_SEC); // nsNavHistoryExpire::nsNavHistoryExpire // diff --git a/toolkit/components/places/tests/unit/test_expiration.js b/toolkit/components/places/tests/unit/test_expiration.js index 6416285bf665..5f3523c3c687 100644 --- a/toolkit/components/places/tests/unit/test_expiration.js +++ b/toolkit/components/places/tests/unit/test_expiration.js @@ -199,8 +199,8 @@ function run_test() { annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_DAYS); annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_DAYS); - // set dateAdded to 7 days ago - var expirationDate = (Date.now() - (7 * 86400 * 1000)) * 1000; + // set dateAdded to 8 days ago + var expirationDate = (Date.now() - (8 * 86400 * 1000)) * 1000; dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); @@ -236,11 +236,40 @@ function run_test() { do_throw("bookmark still had days anno"); } catch(ex) {} - // test anno expiration (weeks) + // test anno expiration (days) removes annos annos 6 days old + histsvc.addVisit(testURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_DAYS); + annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_DAYS); + // these annotations should remain as they are only 6 days old + var expirationDate = (Date.now() - (6 * 86400 * 1000)) * 1000; + dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); + dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); + + // add a uri and then remove it, to trigger expiration + histsvc.addVisit(triggerURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + bhist.removePage(triggerURI); + + // test for unexpired annos + try { + do_check_eq(annosvc.getPageAnnotation(testURI, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("anno < 7 days old was expired!"); + } + annosvc.removePageAnnotation(testURI, testAnnoName); + try { + do_check_eq(annosvc.getItemAnnotation(bookmark, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("item anno < 7 days old was expired!"); + } + annosvc.removeItemAnnotation(bookmark, testAnnoName); + + + // test anno expiration (weeks) removes annos 31 days old histsvc.addVisit(testURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_WEEKS); annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_WEEKS); - var expirationDate = (Date.now() - (30 * 86400 * 1000)) * 1000; + // these annotations should not remain as they are 31 days old + var expirationDate = (Date.now() - (31 * 86400 * 1000)) * 1000; dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); // these annotations should remain @@ -274,10 +303,37 @@ function run_test() { do_throw("bookmark still had weeks anno"); } catch(ex) {} - // test anno expiration (months) + // test anno expiration (weeks) does not remove annos 29 days old + histsvc.addVisit(testURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_WEEKS); + annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_WEEKS); + // these annotations should remain as they are only 29 days old + var expirationDate = (Date.now() - (29 * 86400 * 1000)) * 1000; + dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); + dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); + + // add a uri and then remove it, to trigger expiration + histsvc.addVisit(triggerURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + bhist.removePage(triggerURI); + + // test for unexpired annos + try { + do_check_eq(annosvc.getPageAnnotation(testURI, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("anno < 30 days old was expired!"); + } + annosvc.removePageAnnotation(testURI, testAnnoName); + try { + do_check_eq(annosvc.getItemAnnotation(bookmark, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("item anno < 30 days old was expired!"); + } + annosvc.removeItemAnnotation(bookmark, testAnnoName); + + // test anno expiration (months) removes annos 181 days old annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_MONTHS); annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_MONTHS); - var expirationDate = (Date.now() - (180 * 86400 * 1000)) * 1000; + var expirationDate = (Date.now() - (181 * 86400 * 1000)) * 1000; dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); // these annotations should remain @@ -311,6 +367,33 @@ function run_test() { do_throw("bookmark still had months anno"); } catch(ex) {} + // test anno expiration (months) does not remove annos 179 days old + histsvc.addVisit(testURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + annosvc.setPageAnnotation(testURI, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_MONTHS); + annosvc.setItemAnnotation(bookmark, testAnnoName, testAnnoVal, 0, annosvc.EXPIRE_MONTHS); + // these annotations should remain as they are only 179 days old + var expirationDate = (Date.now() - (179 * 86400 * 1000)) * 1000; + dbConnection.executeSimpleSQL("UPDATE moz_annos SET dateAdded = " + expirationDate); + dbConnection.executeSimpleSQL("UPDATE moz_items_annos SET dateAdded = " + expirationDate); + + // add a uri and then remove it, to trigger expiration + histsvc.addVisit(triggerURI, Date.now(), 0, histsvc.TRANSITION_TYPED, false, 0); + bhist.removePage(triggerURI); + + // test for unexpired annos + try { + do_check_eq(annosvc.getPageAnnotation(testURI, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("anno < 180 days old was expired!"); + } + annosvc.removePageAnnotation(testURI, testAnnoName); + try { + do_check_eq(annosvc.getItemAnnotation(bookmark, testAnnoName), testAnnoVal); + } catch(ex) { + do_throw("item anno < 180 days old was expired!"); + } + annosvc.removeItemAnnotation(bookmark, testAnnoName); + // test anno expiration (session) // XXX requires app restart From eb6bf283f2f4ac23fc80980d21b580ffb16088e2 Mon Sep 17 00:00:00 2001 From: "sayrer@gmail.com" Date: Thu, 23 Aug 2007 15:37:05 -0700 Subject: [PATCH 365/368] Bug 393300. DOMStorage leaks mozStorage classes on shutdown. r+sr+a=jst --- dom/src/storage/nsDOMStorage.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index aa753d43f074..e7b1ca8a1fcf 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -162,6 +162,9 @@ nsDOMStorageManager::Shutdown() { NS_IF_RELEASE(gStorageManager); gStorageManager = nsnull; + + delete nsDOMStorage::gStorageDB; + nsDOMStorage::gStorageDB = nsnull; } PR_STATIC_CALLBACK(PLDHashOperator) From aa4b04be421b1701429d8cf686fe0f463a224ba4 Mon Sep 17 00:00:00 2001 From: "roc+@cs.cmu.edu" Date: Thu, 23 Aug 2007 15:52:42 -0700 Subject: [PATCH 366/368] Bug 393146. Make libxul builds work with --disable-xmlextras. r=luser,a=bz --- toolkit/library/libxul-config.mk | 7 ++++++- toolkit/library/nsStaticXULComponents.cpp | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk index ee51be726d4d..9641cf74ac41 100644 --- a/toolkit/library/libxul-config.mk +++ b/toolkit/library/libxul-config.mk @@ -114,7 +114,6 @@ COMPONENT_LIBS += \ htmlpars \ imglib2 \ gklayout \ - xmlextras \ docshell \ embedcomponents \ webbrwsr \ @@ -127,6 +126,12 @@ COMPONENT_LIBS += \ pipnss \ $(NULL) +ifdef MOZ_XMLEXTRAS +COMPONENT_LIBS += \ + xmlextras \ + $(NULL) +endif + ifdef MOZ_PLUGINS DEFINES += -DMOZ_PLUGINS COMPONENT_LIBS += \ diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp index 3ff403fcc02a..bf5aa94af897 100644 --- a/toolkit/library/nsStaticXULComponents.cpp +++ b/toolkit/library/nsStaticXULComponents.cpp @@ -250,6 +250,12 @@ #define SPELLCHECK_MODULE #endif +#ifdef MOZ_XMLEXTRAS +#define XMLEXTRAS_MODULE MODULE(nsXMLExtrasModule) +#else +#define XMLEXTRAS_MODULE +#endif + #define XUL_MODULES \ MODULE(xpconnect) \ MATHML_MODULES \ @@ -273,7 +279,6 @@ ICON_MODULE \ PLUGINS_MODULES \ MODULE(nsLayoutModule) \ - MODULE(nsXMLExtrasModule) \ WEBSERVICES_MODULES \ MODULE(docshell_provider) \ MODULE(embedcomponents) \ @@ -299,6 +304,7 @@ MODULE(NSS) \ SYSTEMPREF_MODULES \ SPELLCHECK_MODULE \ + XMLEXTRAS_MODULE \ LAYOUT_DEBUG_MODULE \ /* end of list */ From 3055bc7d89d4e3df3d4df988488a519e62073a53 Mon Sep 17 00:00:00 2001 From: "sharparrow1@yahoo.com" Date: Thu, 23 Aug 2007 16:01:52 -0700 Subject: [PATCH 367/368] Bug 393286: Make nsCSSScanner::Read regularize newlines. r+sr=bzbarsky, a=dbaron --- layout/style/nsCSSScanner.cpp | 68 +++++++++++++++++------------------ layout/style/nsCSSScanner.h | 2 +- 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp index 51317ec5ff91..d3bcf763239a 100644 --- a/layout/style/nsCSSScanner.cpp +++ b/layout/style/nsCSSScanner.cpp @@ -288,7 +288,6 @@ void nsCSSScanner::Init(nsIUnicharInputStream* aInput, // Reset variables that we use to keep track of our progress through the input mOffset = 0; mPushbackCount = 0; - mLastRead = 0; #ifdef CSS_REPORT_PARSE_ERRORS mColNumber = 0; @@ -466,6 +465,24 @@ void nsCSSScanner::Close() #define TAB_STOP_WIDTH 8 #endif +PRBool nsCSSScanner::EnsureData(nsresult& aErrorCode) +{ + if (mOffset < mCount) + return PR_TRUE; + + if (mInputStream) { + mOffset = 0; + aErrorCode = mInputStream->Read(mBuffer, CSS_BUFFER_SIZE, &mCount); + if (NS_FAILED(aErrorCode) || mCount == 0) { + mCount = 0; + return PR_FALSE; + } + return PR_TRUE; + } + + return PR_FALSE; +} + // Returns -1 on error or eof PRInt32 nsCSSScanner::Read(nsresult& aErrorCode) { @@ -473,20 +490,21 @@ PRInt32 nsCSSScanner::Read(nsresult& aErrorCode) if (0 < mPushbackCount) { rv = PRInt32(mPushback[--mPushbackCount]); } else { - if (mOffset == mCount) { - mOffset = 0; - if (!mInputStream) { - mCount = 0; - return -1; - } - aErrorCode = mInputStream->Read(mBuffer, CSS_BUFFER_SIZE, &mCount); - if (NS_FAILED(aErrorCode) || mCount == 0) { - mCount = 0; - return -1; - } + if (mOffset == mCount && !EnsureData(aErrorCode)) { + return -1; } rv = PRInt32(mReadPointer[mOffset++]); - if (((rv == '\n') && (mLastRead != '\r')) || (rv == '\r')) { + // There are four types of newlines in CSS: "\r", "\n", "\r\n", and "\f". + // To simplify dealing with newlines, they are all normalized to "\n" here + if (rv == '\r') { + if (EnsureData(aErrorCode) && mReadPointer[mOffset] == '\n') { + mOffset++; + } + rv = '\n'; + } else if (rv == '\f') { + rv = '\n'; + } + if (rv == '\n') { // 0 is a magical line number meaning that we don't know (i.e., script) if (mLineNumber != 0) ++mLineNumber; @@ -503,7 +521,6 @@ PRInt32 nsCSSScanner::Read(nsresult& aErrorCode) } #endif } - mLastRead = rv; //printf("Read => %x\n", rv); return rv; } @@ -511,9 +528,7 @@ PRInt32 nsCSSScanner::Read(nsresult& aErrorCode) PRInt32 nsCSSScanner::Peek(nsresult& aErrorCode) { if (0 == mPushbackCount) { - PRInt32 savedLastRead = mLastRead; PRInt32 ch = Read(aErrorCode); - mLastRead = savedLastRead; if (ch < 0) { return -1; } @@ -562,7 +577,7 @@ PRBool nsCSSScanner::EatWhiteSpace(nsresult& aErrorCode) if (ch < 0) { break; } - if ((ch == ' ') || (ch == '\n') || (ch == '\r') || (ch == '\t')) { + if ((ch == ' ') || (ch == '\n') || (ch == '\t')) { eaten = PR_TRUE; continue; } @@ -579,13 +594,7 @@ PRBool nsCSSScanner::EatNewline(nsresult& aErrorCode) return PR_FALSE; } PRBool eaten = PR_FALSE; - if (ch == '\r') { - eaten = PR_TRUE; - ch = Peek(aErrorCode); - if (ch == '\n') { - (void) Read(aErrorCode); - } - } else if (ch == '\n') { + if (ch == '\n') { eaten = PR_TRUE; } else { Pushback(ch); @@ -862,10 +871,6 @@ nsCSSScanner::ParseAndAppendEscape(nsresult& aErrorCode, nsString& aOutput) } else { NS_ASSERTION((lexTable[ch] & IS_WHITESPACE) != 0, "bad control flow"); // single space ends escape - if (ch == '\r' && Peek(aErrorCode) == '\n') { - // if CR/LF, eat LF too - Read(aErrorCode); - } break; } } @@ -874,13 +879,6 @@ nsCSSScanner::ParseAndAppendEscape(nsresult& aErrorCode, nsString& aOutput) if ((0 <= ch) && (ch <= 255) && ((lexTable[ch] & IS_WHITESPACE) != 0)) { ch = Read(aErrorCode); - // special case: if trailing whitespace is CR/LF, eat both chars (not part of spec, but should be) - if (ch == '\r') { - ch = Peek(aErrorCode); - if (ch == '\n') { - ch = Read(aErrorCode); - } - } } } NS_ASSERTION(rv >= 0, "How did rv become negative?"); diff --git a/layout/style/nsCSSScanner.h b/layout/style/nsCSSScanner.h index c053e2704fc1..1c2643d6a3aa 100644 --- a/layout/style/nsCSSScanner.h +++ b/layout/style/nsCSSScanner.h @@ -198,6 +198,7 @@ class nsCSSScanner { } protected: + PRBool EnsureData(nsresult& aErrorCode); PRInt32 Read(nsresult& aErrorCode); PRInt32 Peek(nsresult& aErrorCode); void Pushback(PRUnichar aChar); @@ -230,7 +231,6 @@ protected: PRUnichar* mPushback; PRInt32 mPushbackCount; PRInt32 mPushbackSize; - PRInt32 mLastRead; PRUnichar mLocalPushback[4]; PRUint32 mLineNumber; From edd95c170675dd0bc9d7eb71c20b8cbe88352a56 Mon Sep 17 00:00:00 2001 From: "dolske@mozilla.com" Date: Thu, 23 Aug 2007 17:01:28 -0700 Subject: [PATCH 368/368] Fix and reenable tests from bug Bug 386005, now that they work on Linux and Windows. r=gavin --- .../test/test_basic_form_autocomplete.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html index 5cc543542cff..21e0f70a41bd 100644 --- a/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html +++ b/toolkit/components/passwordmgr/test/test_basic_form_autocomplete.html @@ -287,9 +287,6 @@ function runTest(testNum) { doKey("return"); checkForm("zzzuser4", "zzzpass4"); -// XXX temp bandaid: bail out now to avoid linux test failure. -SimpleTest.finish(); -return; // Trigger autocomplete popup restoreForm(); doKey("down"); @@ -318,12 +315,13 @@ return; case 50: // Delete the first entry (of 4), "tempuser1" doKey("down"); - // XXX Just "delete", and on Mac also shift-backspace? var numLogins; numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null); is(numLogins, 4, "Correct number of logins before deleting one"); - doKey("back_space", shiftModifier); + // On OS X, shift-backspace and shift-delete work, just delete does not. + // On Win/Linux, shift-backspace does not work, delete and shift-delete do. + doKey("delete", shiftModifier); checkForm("zzzuser4", ""); // why does a value get set here? numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null); @@ -351,7 +349,7 @@ return; // Delete the second entry (of 3), "testuser3" doKey("down"); doKey("down"); - doKey("back_space", shiftModifier); + doKey("delete", shiftModifier); checkForm("testuser2", ""); // XXX why does a value get set here? numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null); is(numLogins, 2, "Correct number of logins after deleting one"); @@ -378,7 +376,7 @@ return; // Delete the last entry (of 2), "zzzuser4" doKey("down"); doKey("down"); - doKey("back_space", shiftModifier); + doKey("delete", shiftModifier); checkForm("testuser2", ""); // XXX why does a value get set here? numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null); is(numLogins, 1, "Correct number of logins after deleting one"); @@ -404,7 +402,7 @@ return; case 56: // Delete the only remaining entry, "testuser2" doKey("down"); - doKey("back_space", shiftModifier); + doKey("delete", shiftModifier); //doKey("return"); checkForm("", ""); numLogins = pwmgr.countLogins("http://localhost:8888", "http://autocomplete:8888", null);