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

Unified Diff: net/socket/client_socket_handle.h

Issue 4935001: Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Cleaned up Created 10 years 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
Index: net/socket/client_socket_handle.h
===================================================================
--- net/socket/client_socket_handle.h (revision 68026)
+++ net/socket/client_socket_handle.h (working copy)
@@ -18,6 +18,7 @@
#include "net/base/net_log.h"
#include "net/base/request_priority.h"
#include "net/http/http_response_info.h"
+#include "net/http/http_stream.h"
#include "net/socket/client_socket.h"
#include "net/socket/client_socket_pool.h"
@@ -109,6 +110,9 @@
void set_ssl_error_response_info(const HttpResponseInfo& ssl_error_state) {
ssl_error_response_info_ = ssl_error_state;
}
+ void set_pending_https_proxy_response_stream(HttpStream* stream) {
+ pending_https_proxy_response_stream_.reset(stream);
+ }
void set_pending_http_proxy_connection(ClientSocketHandle* connection) {
pending_http_proxy_connection_.reset(connection);
}
@@ -124,6 +128,9 @@
const HttpResponseInfo& ssl_error_response_info() const {
return ssl_error_response_info_;
}
+ HttpStream* release_pending_https_proxy_response_stream() {
+ return pending_https_proxy_response_stream_.release();
+ }
ClientSocketHandle* release_pending_http_proxy_connection() {
return pending_http_proxy_connection_.release();
}
@@ -172,6 +179,7 @@
int pool_id_; // See ClientSocketPool::ReleaseSocket() for an explanation.
bool is_ssl_error_;
HttpResponseInfo ssl_error_response_info_;
+ scoped_ptr<HttpStream> pending_https_proxy_response_stream_;
scoped_ptr<ClientSocketHandle> pending_http_proxy_connection_;
base::TimeTicks init_time_;
base::TimeDelta setup_time_;

Powered by Google App Engine
This is Rietveld 408576698