--- a/netwerk/ipc/NeckoCommon.h
+++ b/netwerk/ipc/NeckoCommon.h
@@ -65,17 +65,17 @@ inline bool
 IsNeckoChild() 
 {
   static bool didCheck = false;
   static bool amChild = false;
 
   if (!didCheck) {
     // This allows independent necko-stacks (instead of single stack in chrome)
     // to still be run.  
-    // TODO: Remove eventually.
+    // TODO: Remove eventually when no longer supported (bug 571126)
     const char * e = PR_GetEnv("NECKO_SEPARATE_STACKS");
     if (!e) 
       amChild = (XRE_GetProcessType() == GeckoProcessType_Content);
     didCheck = true;
   }
   return amChild;
 }
 

--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -107,17 +107,17 @@ HttpChannelChild::RecvOnStartRequest(con
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this));
 
   mState = HCC_ONSTART;
 
   mResponseHead = new nsHttpResponseHead(responseHead);
 
   nsresult rv = mListener->OnStartRequest(this, mListenerContext);
   if (!NS_SUCCEEDED(rv)) {
-    // TODO: Cancel request:
+    // TODO: Cancel request: (bug 536317)
     //  - Send Cancel msg to parent 
     //  - drop any in flight OnDataAvail msgs we receive
     //  - make sure we do call OnStopRequest eventually
     //  - return true here, not false
     return false;  
   }
   return true;
 }
@@ -144,17 +144,17 @@ HttpChannelChild::RecvOnDataAvailable(co
   if (!NS_SUCCEEDED(rv)) {
     // TODO:  what to do here?  Cancel request?  Very unlikely to fail.
     return false;  
   }
   rv = mListener->OnDataAvailable(this, mListenerContext,
                                   stringStream, offset, count);
   stringStream->Close();
   if (!NS_SUCCEEDED(rv)) {
-    // TODO: Cancel request: see notes in OnStartRequest
+    // TODO: Cancel request: see OnStartRequest. Bug 536317
     return false; 
   }
   return true;
 }
 
 bool 
 HttpChannelChild::RecvOnStopRequest(const nsresult& statusCode)
 {
@@ -171,17 +171,17 @@ HttpChannelChild::RecvOnStopRequest(cons
 
   if (mLoadGroup)
     mLoadGroup->RemoveRequest(this, nsnull, statusCode);
 
   // Corresponding AddRef in AsyncOpen().
   this->Release();
   
   if (!NS_SUCCEEDED(rv)) {
-    // TODO: Cancel request: see notes in OnStartRequest
+    // TODO: Cancel request: see OnStartRequest (bug 536317)
     return false;  
   }
   return true;
 }
 
 bool
 HttpChannelChild::RecvOnProgress(const PRUint64& progress,
                                  const PRUint64& progressMax)

--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -57,17 +57,17 @@
 #include "nsIUploadChannel2.h"
 #include "nsIResumableChannel.h"
 #include "nsIProxiedChannel.h"
 #include "nsITraceableChannel.h"
 
 namespace mozilla {
 namespace net {
 
-// TODO: replace with IPDL states
+// TODO: replace with IPDL states: bug 536319
 enum HttpChannelChildState {
   HCC_NEW,
   HCC_OPENED,
   HCC_ONSTART,
   HCC_ONDATA,
   HCC_ONSTOP
 };
 

--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -224,17 +224,17 @@ HttpChannelParent::OnDataAvailable(nsIRe
 
   nsCString data;
   data.SetLength(aCount);
   char * p = data.BeginWriting();
   PRUint32 bytesRead;
   rv = aInputStream->Read(p, aCount, &bytesRead);
   data.EndWriting();
   if (!NS_SUCCEEDED(rv) || bytesRead != aCount) {
-    return rv;              // TODO: figure out error handling
+    return rv;              // TODO: cancel request locally (bug 536317)
   }
 
   if (mIPCClosed || !SendOnDataAvailable(data, aOffset, bytesRead))
     return NS_ERROR_UNEXPECTED; 
   return NS_OK;
 }
 
 //-----------------------------------------------------------------------------

--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -55,19 +55,19 @@ namespace net {
 protocol PHttpChannel
 {
   manager PNecko;
 
 parent:
   __delete__();
 
   AsyncOpen(URI                 uri,
-            // - TODO: unclear if any HTTP channel clients ever set
-            // originalURI != uri (about:credits?); also not clear if chrome
-            // channel would ever need to know.  Can we get rid of next arg?
+            // - TODO: bug 571161: unclear if any HTTP channel clients ever
+            // set originalURI != uri (about:credits?); also not clear if
+            // chrome channel would ever need to know.  Get rid of next arg?
             URI                 original,
             URI                 doc,
             URI                 referrer,
             PRUint32            loadFlags,
             RequestHeaderTuples requestHeaders,
             nsHttpAtom          requestMethod,
             nsCString           uploadStreamData,
             PRInt32             uploadStreamInfo,