| e14dcc5a172cad1c4716af7ab94121a73c0c698e |
|
08-Jul-2011 |
Ashish Sharma <ashishsharma@google.com> |
Network traffic accounting for client applications that use chromium
URLRequest stack.
Change-Id: If7821debd1b10b19ebf5a3e7b9f6570efc73c4fc
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| dfffe33b592d92936093aae70ed06488fc7798ed |
|
05-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Fix conflicts and compile errors from ignore limits
Getting our own change down again, fixed them here instead of
as a precursor as that was simpler and should be easy to follow.
This was upstreamed by us, and taking the upstream version now.
CL:
http://codereview.chromium.org/6756004
Also all TCP classes was renamed to transport in upstream CL:
http://codereview.chromium.org/6804028
Change-Id: I4d479960977f23a0de0bd3cf59ddedf1afb211a5
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 5852652987a195e279633156fd0f937f6e12a918 |
|
02-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.cc
Function with local edits moved in chromium:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_proxy_client_socket_pool.cc?view=diff&pathrev=74924&r1=72161&r2=72162
Removed local TODO comment as it is not needed.
Change-Id: I39c1e29e219afd438fb6763354104d7ac5300f89
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 94dee9037a31fbf43ed22eaa2a84fb4e7cd5569e |
|
12-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Fix conflict in http_proxy_client_socket.cc
Local patch too close to upstream change:
http://codereview.chromium.org/4935001
Has been upstreamed, but we are merging to an earlier upstream
version.
Change-Id: Ibbde495d0d699e305a6f60d652764cc79670da0b
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 21d179b334e59e9a3bfcaed4c4430bef1bc5759d |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 7b9ca917061470268bf3395c8925d4b9cc52d8e1 |
|
11-Mar-2011 |
Kristian Monsen <kristianm@google.com> |
Fix for bug 3491968 Browser frozen on dunkindonuts.com
If a sync request returns ERR_IO_PENDING it will block and
never complete.
Waiting for connect() to complete with select(). If it doesn't
complete within 20 seconds, return an error.
Change-Id: Ie5859b482dd64248036c2ad9ef57e63d468db2d4
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 21ae586050b3022a662bfe7743553d462ae4ced8 |
|
07-Mar-2011 |
Kristian Monsen <kristianm@google.com> |
Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.com
Letting sync requests create sockets even if the total number of
sockets has reached max or the number of sockets in the group is
full.
Change-Id: Id6f4e0015af67d1b4124f00106433b1977995f45
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 201ade2fbba22bfb27ae029f4d23fca6ded109a0 |
|
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
|
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| 3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|
| c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/net/http/http_proxy_client_socket_pool.cc
|