diff --git a/mozilla/netwerk/base/public/nsIChannel.idl b/mozilla/netwerk/base/public/nsIChannel.idl
index 3a4e5939525..c8001e5ec36 100644
--- a/mozilla/netwerk/base/public/nsIChannel.idl
+++ b/mozilla/netwerk/base/public/nsIChannel.idl
@@ -95,7 +95,7 @@ interface nsIChannel : nsIRequest
      * callbacks do not supply the requested interface.
      * 
      * Interfaces commonly requested include: nsIProgressEventSink, nsIPrompt,
-     * and nsIAuthPrompt.
+     * and nsIAuthPrompt/nsIAuthPrompt2.
      *
      * When the channel is done, it must not continue holding references to
      * this object.
@@ -192,6 +192,9 @@ interface nsIChannel : nsIRequest
      * keeping itself alive until it has called onStopRequest on aListener or
      * called onChannelRedirect.
      *
+     * Implementations are allowed to synchronously add themselves to the
+     * associated load group (if any).
+     *
      * NOTE: Implementations should throw NS_ERROR_ALREADY_OPENED if the
      * channel is reopened.
      *
diff --git a/mozilla/netwerk/base/public/nsIRequest.idl b/mozilla/netwerk/base/public/nsIRequest.idl
index 66ad9bbd96f..12e00bd9c3f 100644
--- a/mozilla/netwerk/base/public/nsIRequest.idl
+++ b/mozilla/netwerk/base/public/nsIRequest.idl
@@ -83,6 +83,13 @@ interface nsIRequest : nsISupports
      * be passed.  The error passed in will become the value of the 
      * status attribute.
      *
+     * Implementations must not send any notifications (e.g. via
+     * nsIRequestObserver) synchronously from this function. Similarly,
+     * removal from the load group (if any) must also happen asynchronously.
+     *
+     * Requests that use nsIStreamListener must not call onDataAvailable
+     * anymore after cancel has been called.
+     *
      * @param aStatus the reason for canceling this request.
      *
      * NOTE: most nsIRequest implementations expect aStatus to be a
@@ -96,7 +103,10 @@ interface nsIRequest : nsISupports
      * Suspends the current request.  This may have the effect of closing
      * any underlying transport (in order to free up resources), although
      * any open streams remain logically opened and will continue delivering
-     * data when the transport is resumed. 
+     * data when the transport is resumed.
+     *
+     * Calling cancel() on a suspended request must not send any
+     * notifications (such as onstopRequest) until the request is resumed.
      *
      * NOTE: some implementations are unable to immediately suspend, and
      * may continue to deliver events already posted to an event queue. In