Issue 1409 - Fix some errors in adblockplustest

chrome/content/httpd.js

 /* -*- Mode: JavaScript; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * An implementation of an HTTP server both as a loadable script and as an XPCOM
  * component.  See the accompanying README file for user documentation on
  * httpd.js.
@@ skipping 687 matching lines @@
     },
 
 
     // NSISUPPORTS
 
     //
     // see nsISupports.QueryInterface
     //
     QueryInterface: function(iid)
     {
-      if (iid.equals(Ci.nsIHttpServer) ||
-          iid.equals(Ci.nsIServerSocketListener) ||
-          iid.equals(Ci.nsISupports))
+      if (iid.equals(Ci.nsIServerSocketListener) || iid.equals(Ci.nsISupports))
         return this;
 
       throw Cr.NS_ERROR_NO_INTERFACE;
     },
 
 
     // NON-XPCOM PUBLIC API
 
     /**
      * Returns true iff this server is not running (and is not in the process of
@@ skipping 1410 matching lines @@
     if (name.charAt(name.length - 1) == HIDDEN_CHAR)
       name = name.substring(0, name.length - 1);
 
     var headerFile = file.parent;
     headerFile.append(name + HEADERS_SUFFIX);
 
     if (!headerFile.exists())
       return;
 
     const PR_RDONLY = 0x01;
-    var fis = new FileInputStream(headerFile, PR_RDONLY, 0444,
+    var fis = new FileInputStream(headerFile, PR_RDONLY, 0o444,
                                   Ci.nsIFileInputStream.CLOSE_ON_EOF);
 
     try
     {
       var lis = new ConverterInputStream(fis, "UTF-8", 1024, 0x0);
       lis.QueryInterface(Ci.nsIUnicharLineInputStream);
 
       var line = {value: ""};
       var more = lis.readLine(line);
 
@@ skipping 514 matching lines @@
      * @param count: uint
      *   the number of bytes to write
      */
     _writeFileResponse: function(metadata, file, response, offset, count)
     {
       const PR_RDONLY = 0x01;
 
       var type = this._getTypeFromFile(file);
       if (type === SJS_TYPE)
       {
-        var fis = new FileInputStream(file, PR_RDONLY, 0444,
+        var fis = new FileInputStream(file, PR_RDONLY, 0o444,
                                       Ci.nsIFileInputStream.CLOSE_ON_EOF);
 
         try
         {
           var sis = new ScriptableInputStream(fis);
           var s = Cu.Sandbox(gGlobalObject);
           s.importFunction(dump, "dump");
 
           // Define a basic key-value state-preservation API across requests, with
           // keys initially corresponding to the empty string.
@@ skipping 73 matching lines @@
           response.setHeader("Last-Modified",
                              toDateString(file.lastModifiedTime),
                              false);
         }
         catch (e) { /* lastModifiedTime threw, ignore */ }
 
         response.setHeader("Content-Type", type, false);
         maybeAddHeaders(file, metadata, response);
         response.setHeader("Content-Length", "" + count, false);
 
-        var fis = new FileInputStream(file, PR_RDONLY, 0444,
+        var fis = new FileInputStream(file, PR_RDONLY, 0o444,
                                       Ci.nsIFileInputStream.CLOSE_ON_EOF);
 
         offset = offset || 0;
         count  = count || file.fileSize;
         NS_ASSERT(offset === 0 || offset < file.fileSize, "bad offset");
         NS_ASSERT(count >= 0, "bad count");
         NS_ASSERT(offset + count <= file.fileSize, "bad total data size");
 
         try
         {
@@ skipping 2508 matching lines @@
 
     // get rid of any pending requests
     while (thread.hasPendingEvents())
       thread.processNextEvent(true);
 
     DEBUG = false;
   }
 
   window.nsHttpServer = nsHttpServer;
 })();