diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 01:42:02 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 01:42:02 +0000 |
| commit | 7de5c8e928e6f81c2283e8efb7a9e6e27db7ecf5 (patch) | |
| tree | bf0d760ca1c3dbe7c033b0411c8d26102aac6d16 /net | |
| parent | c09860fcca062ea9a0c7cc1ab87863ddf5e9352d (diff) | |
| download | chromium_src-7de5c8e928e6f81c2283e8efb7a9e6e27db7ecf5.zip chromium_src-7de5c8e928e6f81c2283e8efb7a9e6e27db7ecf5.tar.gz chromium_src-7de5c8e928e6f81c2283e8efb7a9e6e27db7ecf5.tar.bz2 | |
I had some debug URL handling turned on in chrome
making the use-flip mode not useful unless you were
using my test environment. Sorry!
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/292040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/flip/flip_network_transaction.cc | 2 | ||||
| -rw-r--r-- | net/flip/flip_session.cc | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/flip/flip_network_transaction.cc b/net/flip/flip_network_transaction.cc index befb07e..3061b36 100644 --- a/net/flip/flip_network_transaction.cc +++ b/net/flip/flip_network_transaction.cc @@ -312,7 +312,7 @@ int FlipNetworkTransaction::DoInitConnection() { // If we want to use multiple connections, grab the flip session // up front using the original domain name. #undef USE_MULTIPLE_CONNECTIONS -#define DIVERT_URLS_TO_TEST_SERVER +#undef DIVERT_URLS_TO_TEST_SERVER #if defined(USE_MULTIPLE_CONNECTIONS) || !defined(DIVERT_URLS_TO_TEST_SERVER) flip_ = FlipSession::GetFlipSession(resolve_info, session_); #endif diff --git a/net/flip/flip_session.cc b/net/flip/flip_session.cc index c8cb53d..d73f915 100644 --- a/net/flip/flip_session.cc +++ b/net/flip/flip_session.cc @@ -159,8 +159,8 @@ void CreateFlipHeadersFromHttpRequest( (*headers)[name] = it.values(); } -#define REWRITE_URLS -#ifdef REWRITE_URLS +#undef DIVERT_URLS_TO_TEST_SERVER +#ifdef DIVERT_URLS_TO_TEST_SERVER // TODO(mbelshe): Figure out how to remove this. This is just for hooking // up to a test server. // For testing content on our test server, we modify the URL. @@ -184,10 +184,11 @@ void CreateFlipHeadersFromHttpRequest( hack_url.replace(pos, 1, "/"); pos += 1; } +#else + std::string hack_url(info->url.PathForRequest()); #endif // REWRITE_URLS (*headers)["method"] = info->method; - // (*headers)["url"] = info->url.PathForRequest(); (*headers)["url"] = hack_url; (*headers)["version"] = kHttpProtocolVersion; if (info->user_agent.length()) |