From bf801fc4cc0b0cf6650f17c59cf04b77a164e63b Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Tue, 18 Mar 2014 20:40:12 -0700 Subject: [PATCH] Back out c91b18cafc64 (bug 960749) CLOSED TREE --- dom/downloads/src/DownloadsIPC.jsm | 2 +- dom/downloads/tests/mochitest.ini | 1 - .../tests/test_downloads_bad_file.html | 93 ------------------- xpcom/glue/nsCRTGlue.h | 9 +- 4 files changed, 5 insertions(+), 100 deletions(-) delete mode 100644 dom/downloads/tests/test_downloads_bad_file.html diff --git a/dom/downloads/src/DownloadsIPC.jsm b/dom/downloads/src/DownloadsIPC.jsm index 978dffc52b64..09a975163f58 100644 --- a/dom/downloads/src/DownloadsIPC.jsm +++ b/dom/downloads/src/DownloadsIPC.jsm @@ -81,7 +81,7 @@ this.DownloadsIPC = { receiveMessage: function(aMessage) { let download = aMessage.data; - debug("message: " + aMessage.name); + debug("message: " + aMessage.name + " " + download.id); switch(aMessage.name) { case "Downloads:GetList:Return": this._updateDownloadsArray(download); diff --git a/dom/downloads/tests/mochitest.ini b/dom/downloads/tests/mochitest.ini index 4b200d829c88..3c907578c19d 100644 --- a/dom/downloads/tests/mochitest.ini +++ b/dom/downloads/tests/mochitest.ini @@ -6,7 +6,6 @@ support-files = [test_downloads_navigator_object.html] [test_downloads_basic.html] [test_downloads_large.html] -[test_downloads_bad_file.html] [test_downloads_pause_remove.html] [test_downloads_pause_resume.html] skip-if = toolkit=='gonk' # b2g(bug 947167) b2g-debug(bug 947167) diff --git a/dom/downloads/tests/test_downloads_bad_file.html b/dom/downloads/tests/test_downloads_bad_file.html deleted file mode 100644 index a2b3992e63b1..000000000000 --- a/dom/downloads/tests/test_downloads_bad_file.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Test for Bug 960749 Downloads API - - - - - - -Mozilla Bug 960749 -

- -Download #1 -
-
-
- - - diff --git a/xpcom/glue/nsCRTGlue.h b/xpcom/glue/nsCRTGlue.h index 516c919d21a5..b6a63f89529f 100644 --- a/xpcom/glue/nsCRTGlue.h +++ b/xpcom/glue/nsCRTGlue.h @@ -110,18 +110,17 @@ NS_COM_GLUE void NS_MakeRandomString(char *buf, int32_t bufLen); #define LFSTR "\012" #define CRLF "\015\012" /* A CR LF equivalent string */ -// We use the most restrictive filesystem as our default set of illegal filename -// characters. This is currently Windows. -#define OS_FILE_ILLEGAL_CHARACTERS "\\/:*?\"<>|" - #if defined(XP_MACOSX) #define FILE_PATH_SEPARATOR "/" + #define OS_FILE_ILLEGAL_CHARACTERS ":" #elif defined(XP_WIN) #define FILE_PATH_SEPARATOR "\\" + #define OS_FILE_ILLEGAL_CHARACTERS "/:*?\"<>|" #elif defined(XP_UNIX) #define FILE_PATH_SEPARATOR "/" + #define OS_FILE_ILLEGAL_CHARACTERS "" #else - #error need_to_define_your_file_path_separator_and_maybe_illegal_characters + #error need_to_define_your_file_path_separator_and_illegal_characters #endif // Not all these control characters are illegal in all OSs, but we don't really