summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
...
* Merge Chromium at r12.0.742.93: Compile fix in net_util_posix.ccKristian Monsen2011-07-081-0/+4
* Merge Chromium at r12.0.742.93: Fix conflicts in x509_certificate*Kristian Monsen2011-07-082-39/+35
* Merge Chromium at r12.0.742.93: Fix conflicts in http_stream_factory_impl_job.ccKristian Monsen2011-07-081-125/+0
* Merge Chromium at r12.0.742.93: Fix conflicts in spdy_session.ccKristian Monsen2011-07-081-5/+0
* Merge Chromium at r12.0.742.93: Fix conflicts in spdy_framer.ccKristian Monsen2011-07-081-4/+0
* Merge Chromium at r12.0.742.93: Fix conflicts and compile errors from ignore ...Kristian Monsen2011-07-0810-158/+10
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-08507-21348/+27658
* Remove a superfluous Android modification to net/http/des.ccSteve Block2011-07-071-5/+0
* Merge Chromium at r11.0.696.0: Compile fixes in spdy_framer.ccKristian Monsen2011-06-301-0/+6
* Merge Chromium at r11.0.696.0: Compile fixes in http_stream_factory_impl_job.ccKristian Monsen2011-06-301-2/+11
* Merge Chromium at r11.0.696.0: Delete file merge left aloneKristian Monsen2011-06-301-1113/+0
* Merge Chromium at r11.0.696.0: Fix conflict in x509_certificate.hKristian Monsen2011-06-291-9/+8
* Merge Chromium at r11.0.696.0: Fix conflict in load_flags_list.hKristian Monsen2011-06-291-8/+5
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29300-11583/+26157
* Revert Android name change of a getter.Kristian Monsen2011-06-292-9/+3
* Merge changes I36d92007,I667a6803,Ia6df2c26,I68425903,I3ed7374e,Icc88f69e,Ifa...Kristian Monsen2011-06-14344-15109/+13238
|\
| * Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.ccKristian Monsen2011-06-141-0/+14
| * Merge Chromium at r11.0.672.0: Compile fix in android_network_library.ccKristian Monsen2011-06-141-1/+4
| * Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.ccKristian Monsen2011-06-141-23/+4
| * Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.ccKristian Monsen2011-06-141-3/+3
| * Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.ccKristian Monsen2011-06-141-38/+8
| * Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.hKristian Monsen2011-06-141-6/+1
| * Merge Chromium at r11.0.672.0: Fix conflicts in net_util.ccKristian Monsen2011-06-141-4/+0
| * Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14343-15076/+13246
* | Merge "Add a null pointer check in ApplyCwndFieldTrial"Russell Brenner2011-06-141-0/+4
|\ \ | |/ |/|
| * Add a null pointer check in ApplyCwndFieldTrialRussell Brenner2011-06-141-0/+4
* | Increase EVP_PKEY reference count before passing value to OpenSSLBrian Carlstrom2011-06-091-0/+1
|/
* Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypa...Kristian Monsen2011-05-312-2/+11
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25166-1571/+2311
* Removing the NullProxy, better Android implementationKristian Monsen2011-05-231-14/+5
* Remove local changes in unused proxy_config_service_linux.hKristian Monsen2011-05-231-2/+0
* Merge Chromium at 10.0.621.0: Fix conflict in url_request_http_job.ccKristian Monsen2011-05-201-5/+1
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_client_socket_pool.ccKristian Monsen2011-05-201-7/+2
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_host_info.ccKristian Monsen2011-05-201-10/+0
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_client_socket_openssl.*Kristian Monsen2011-05-202-79/+0
* Merge Chromium at 10.0.621.0: Fix conflict in http_proxy_client_socket.ccKristian Monsen2011-05-202-17/+7
* Merge Chromium at 10.0.621.0: Fix conflict in des.ccKristian Monsen2011-05-201-7/+0
* Merge Chromium at 10.0.621.0: Fix conflict in cookie_monster.*Kristian Monsen2011-05-162-21/+0
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16333-4342/+8434
* am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-3077-45322/+0
|\
| * Removing projects that are not needed to compileKristian Monsen2011-03-3077-45322/+0
* | Reduce the TCP Keep Alive intervalBen Murdoch2011-03-251-1/+1
* | Cherry pick Chrome r71482Ben Murdoch2011-03-221-0/+24
* | Fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-1125-27/+203
* | Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-0912-9/+128
* | Updating the des code, mostly just proper castsKristian Monsen2011-03-031-6/+11
* | Fix for bug 2386130 VZW:PP659: login issues on some sites:http://traffic.cumu...Kristian Monsen2011-03-031-10/+10
* | Importing two ssl_client_socket_openssl.cc patches from upstream chromiumBrian Carlstrom2011-03-011-14/+45
* | Fix for bug 3435888 Native crash in BrowserKristian Monsen2011-02-251-0/+4
* | Merge Chromium at 9.0.597.106Steve Block2011-02-181-0/+3