Merge latest green inbound changeset and mozilla-central; r=khuey to work around bug 1002652 comment 13

netwerk/protocol/http/nsHttpConnectionMgr.cpp

@@ -2366,6 +2366,13 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param)
             ConditionallyStopTimeoutTick();
         }
 
+        // a connection that still holds a reference to a transaction was
+        // not closed naturally (i.e. it was reset or aborted) and is
+        // therefore not something that should be reused.
+        if (conn->Transaction()) {
+            conn->DontReuse();
+        }
+
         if (conn->CanReuse()) {
             LOG(("  adding connection to idle list\n"));
             // Keep The idle connection list sorted with the connections that

netwerk/protocol/http/nsHttpTransaction.cpp

@@ -1066,7 +1066,10 @@ nsHttpTransaction::Restart()
 
     // clear old connection state...
     mSecurityInfo = 0;
-    NS_IF_RELEASE(mConnection);
+    if (mConnection) {
+        mConnection->DontReuse();
+        NS_RELEASE(mConnection);
+    }
 
     // disable pipelining for the next attempt in case pipelining caused the
     // reset.  this is being overly cautious since we don't know if pipelining