Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: libcurl_http_fetcher.h

Issue 5205002: AU: Manual proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master
Patch Set: missed one fix for review Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « http_fetcher_unittest.cc ('k') | libcurl_http_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libcurl_http_fetcher.h
diff --git a/libcurl_http_fetcher.h b/libcurl_http_fetcher.h
index b3ba518d5f6e865b447f5a08f7361e8f74844527..c41804e38703744bd3b0a594c1c77541ed972897 100644
--- a/libcurl_http_fetcher.h
+++ b/libcurl_http_fetcher.h
@@ -22,8 +22,9 @@ class LibcurlHttpFetcher : public HttpFetcher {
public:
static const int kMaxRedirects = 10;
- LibcurlHttpFetcher()
- : curl_multi_handle_(NULL),
+ explicit LibcurlHttpFetcher(ProxyResolver* proxy_resolver)
+ : HttpFetcher(proxy_resolver),
+ curl_multi_handle_(NULL),
curl_handle_(NULL),
timeout_source_(NULL),
transfer_in_progress_(false),
@@ -38,6 +39,7 @@ class LibcurlHttpFetcher : public HttpFetcher {
force_build_type_(false),
forced_official_build_(false),
in_write_callback_(false),
+ sent_byte_(false),
terminate_requested_(false) {}
// Cleans up all internal state. Does not notify delegate
@@ -198,6 +200,10 @@ class LibcurlHttpFetcher : public HttpFetcher {
// If true, we are currently performing a write callback on the delegate.
bool in_write_callback_;
+
+ // If true, we have returned at least one byte in the write callback
+ // to the delegate.
+ bool sent_byte_;
// We can't clean everything up while we're in a write callback, so
// if we get a terminate request, queue it until we can handle it.
« no previous file with comments | « http_fetcher_unittest.cc ('k') | libcurl_http_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698