Port:

 - net/base/dns_resolution_observer.cc
 - net/http/http_network_transaction.cc
 - net/url_request/url_request_filter.cc
Add to net library the above and:
 - net/base/dns_resolution_observer.cc
 - net/base/upload_data_stream.cc
 - net/http/http_network_layer.cc
 - net/proxy/proxy_resolver_fixed.cc
 - net/proxy/proxy_service.cc
 - net/url_request/url_request_job_manager.cc
Add to net_unittests:
 - net/http/http_network_transaction_unittest.cc
 - net/http/http_transaction_unittest.cc
 - net/http/http_util_unittest.cc

Patch by Paweł Hajdan jr <phajdan.jr@gmail.com>


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3867 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 1 deletions

diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index f7d7058..12e72e0 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -421,7 +421,8 @@ int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
   // Set the reused_socket_ flag to indicate that we are using a keep-alive
   // connection.  This flag is used to handle errors that occur while we are
   // trying to reuse a keep-alive connection.
-  if (reused_socket_ = (connection_.socket() != NULL)) {
+  reused_socket_ = (connection_.socket() != NULL);
+  if (reused_socket_) {
     next_state_ = STATE_WRITE_HEADERS;
   } else {
     next_state_ = STATE_RESOLVE_HOST;