diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-29 18:22:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-11 11:34:17 +0100 |
| commit | 00d26a728db2814620f390b418a7d6325ce5aca6 (patch) | |
| tree | 1a08a766ac3682d979bba42bb32150b3e6b93fdc /net/http | |
| parent | b3a45980d5cfbb62c937045255faa29a8ffea9f3 (diff) | |
| download | external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.zip external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.gz external_chromium-00d26a728db2814620f390b418a7d6325ce5aca6.tar.bz2 | |
Collection of all the changs to external chromium.
Time is running out, I guess we have to submit this and remember to upstream.
Rebased to chromium r53293
Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/des.cc | 8 | ||||
| -rw-r--r-- | net/http/http_cache_transaction.cc | 2 | ||||
| -rw-r--r-- | net/http/http_network_transaction.cc | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/net/http/des.cc b/net/http/des.cc index 0ca12b9..a611f51 100644 --- a/net/http/des.cc +++ b/net/http/des.cc @@ -215,6 +215,14 @@ void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) { CryptReleaseContext(provider, 0); } +#elif defined(USE_OPENSSL) + +// To be implemented with openssl +void DESEncrypt(const uint8* key, const uint8* src, uint8* hash) { + int* a = NULL; + int c = *a; +} + #endif } // namespace net diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 2ea08b8..9bbf4d1 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -1868,7 +1868,7 @@ void HttpCache::Transaction::HistogramHeaders( // |value| goes from 0 to 63. Actually, the max value should be 47 (0x2f) // but we'll see. - UMA_HISTOGRAM_ENUMERATION("HttpCache.ResponseHeaders", value, 65); +// UMA_HISTOGRAM_ENUMERATION("HttpCache.ResponseHeaders", value, 65); } void HttpCache::Transaction::OnIOComplete(int result) { diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index a85a1ca..6783a0a 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -1621,6 +1621,10 @@ void HttpNetworkTransaction::ResetConnectionAndRequestForResend() { } int HttpNetworkTransaction::ReconsiderProxyAfterError(int error) { +#ifdef ANDROID + // Android crashes :( + return error; +#endif DCHECK(!pac_request_); // A failure to resolve the hostname or any error related to establishing a |