cashew: patch in libcurl_http_fetcher changes from update_engine

src/libcurl_http_fetcher.h

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE: lifted from src/platform/update_engine and tweaked for cashew
 // TODO(vlaviano): see http_fetcher.h
 
 #ifndef SRC_LIBCURL_HTTP_FETCHER_H_
 #define SRC_LIBCURL_HTTP_FETCHER_H_
 
@@ skipping 106 matching lines @@
   }
 
   // Cleans up the following if they are non-null:
   // curl(m) handles, io_channels_, timeout_source_.
   void CleanUp();
 
   // Handles for the libcurl library
   CURLM *curl_multi_handle_;
   CURL *curl_handle_;
 
-  // a list of all file descriptors that we're waiting on from the
-  // glib main loop
+  // Lists of all read(0)/write(1) file descriptors that we're waiting on from
+  // the glib main loop. libcurl may open/close descriptors and switch their
+  // directions so maintain two separate lists so that watch conditions can be
+  // set appropriately.
   typedef std::map<int, std::pair<GIOChannel*, guint> > IOChannels;
-  IOChannels io_channels_;
+  IOChannels io_channels_[2];
 
   // if non-NULL, a timer we're waiting on. glib main loop will call us back
   // when it fires.
   GSource* timeout_source_;
 
   bool transfer_in_progress_;
 
   // The transfer size. -1 if not known.
   off_t transfer_size_;
 
@@ skipping 12 matching lines @@
 
   // Seconds to wait before asking libcurl to "perform".
   int idle_seconds_;
 
   DISALLOW_COPY_AND_ASSIGN(LibcurlHttpFetcher);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_LIBCURL_HTTP_FETCHER_H_