summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge Chromium at r12.0.742.93: Compile fix in net_util_posix.ccKristian Monsen2011-07-081-0/+4
| | | | | Change-Id: I7a758d171b67714048dbad8b52143a63af750a41 http://codereview.chromium.org/6676027
* Merge Chromium at r12.0.742.93: Fix conflicts in x509_certificate*Kristian Monsen2011-07-082-39/+35
| | | | | | | | | | Changes close to local edits, moved functions to bottom of section. Several upstream CL's: http://codereview.chromium.org/4645001 http://codereview.chromium.org/6793041 Change-Id: I173e5bb2abadfd1f4ca5edbaedd3a564a648ca86
* Merge Chromium at r12.0.742.93: Fix conflicts in http_stream_factory_impl_job.ccKristian Monsen2011-07-081-125/+0
| | | | | | | | | | Not sure which CL caused the large diff, most relevant are: http://src.chromium.org/viewvc/chrome/branches/742/src/net/http/http_stream_factory_impl_job.cc?view=diff&pathrev=88489&r1=77907&r2=77908 http://src.chromium.org/viewvc/chrome/branches/742/src/net/http/http_stream_factory_impl_job.cc?view=diff&pathrev=88489&r1=79640&r2=79641 Our change was only a compile fix, so using the upstream version of the file. Change-Id: I74d8a437bb8764d0b95f2179e004a8253c1aa894
* Merge Chromium at r12.0.742.93: Fix conflicts in spdy_session.ccKristian Monsen2011-07-081-5/+0
| | | | | | | Local change close to upstream edit: http://src.chromium.org/viewvc/chrome/branches/742/src/net/spdy/spdy_session.cc?view=diff&pathrev=88489&r1=81148&r2=81149 Change-Id: I0c888c3cb92ac7f63553adc9d0202218088e5824
* Merge Chromium at r12.0.742.93: Fix conflicts in spdy_framer.ccKristian Monsen2011-07-081-4/+0
| | | | | | | Include moved close to local change: http://src.chromium.org/viewvc/chrome/branches/742/src/net/spdy/spdy_framer.cc?view=diff&pathrev=88489&r1=79523&r2=79524 Change-Id: Idf9b274dbed1dfdd24cc25a278828bf20d47b9fd
* Merge Chromium at r12.0.742.93: Fix conflicts and compile errors from ignore ↵Kristian Monsen2011-07-0810-158/+10
| | | | | | | | | | | | | | | | | 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
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-08507-21348/+27658
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Remove a superfluous Android modification to net/http/des.ccSteve Block2011-07-071-5/+0
| | | | | | | | | | | | | This is left over from when we added a local USE_OPENSSL switch in https://android-git.corp.google.com/g/#change,99767 and https://android-git.corp.google.com/g/#change,99787 (without ANDROID guards!). A USE_OPENSSL switch was added upstream in https://android-git.corp.google.com/g/#change,110075, which rendered our switch useless. Change-Id: I7fba7acf3d6a65c4bce5423b095187f6c52b08fb
* Merge Chromium at r11.0.696.0: Compile fixes in spdy_framer.ccKristian Monsen2011-06-301-0/+6
| | | | | | Valgrind is not used for Android Change-Id: I7f17f4e20f019711654b0df247dd68d69e5e97fa
* Merge Chromium at r11.0.696.0: Compile fixes in http_stream_factory_impl_job.ccKristian Monsen2011-06-301-2/+11
| | | | | | | File used after merge, fixing compile problem with Android having an extra parameter. Change-Id: Icecb306e3aae35dca422c0372965249ea52ba2a5
* Merge Chromium at r11.0.696.0: Delete file merge left aloneKristian Monsen2011-06-301-1113/+0
| | | | | | Was left alone since it has local edits. Change-Id: I77f30b18ec1461a152f3b39a9f8418542ec5d6ac
* Merge Chromium at r11.0.696.0: Fix conflict in x509_certificate.hKristian Monsen2011-06-291-9/+8
| | | | | | | Function added close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/net/base/x509_certificate.h?view=diff&pathrev=77261&r1=76823&r2=76824 Change-Id: I0187ee2f969f7534653a01f9c12d3a28ea14d4ff
* Merge Chromium at r11.0.696.0: Fix conflict in load_flags_list.hKristian Monsen2011-06-291-8/+5
| | | | | | | | | | Local edit close to change: http://src.chromium.org/viewvc/chrome/trunk/src/net/base/load_flags_list.h?view=diff&pathrev=77261&r1=77181&r2=77182 Moved the Android edit to the bottom, and updated the flag to avoid conflict. Change-Id: I4025fa59566b5cf3f9984eb3953d314baf191010
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29300-11583/+26157
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Revert Android name change of a getter.Kristian Monsen2011-06-292-9/+3
| | | | | | | Had followed the code style, which says that a virtual getter should follow a different code style, but this causes conflicts. Change-Id: I083b28f179192b34e400fa8fc60d91e6332ca057
* Merge changes ↵Kristian Monsen2011-06-14344-15109/+13238
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I36d92007,I667a6803,Ia6df2c26,I68425903,I3ed7374e,Icc88f69e,Ifa32ffeb,I2819b8a4,I0267206e,I4fbbef3c,Ic2f68044,Idcad89f5,Ia2d53e01,Ifd158f1a,I13ae0d97,Ie63b95f5,Icbc82026,I9547a3c8,I55c66cce,I39c1e29e,Ibfb86a74,I8a0c21f6,I3c06547e,I9b689dfe,I8b4aaf61,I5ee38228,Iee92f225 * changes: Remove guards for upstreamed change Merge Chromium at r11.0.672.0: Compile fixes in pref_service.cc Merge Chromium at r11.0.672.0: Compile fix in autofill_manager.* Merge Chromium at r11.0.672.0: Compile fix in profile_android.h Merge Chromium at r11.0.672.0: Compile fix in android_url_request_context_getter.* Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.cc Merge Chromium at r11.0.672.0: Compile fix in android_network_library.cc Merge Chromium at r11.0.672.0: Compile fix in url_fetcher_proxy.h Merge Chromium at r11.0.672.0: Files moved upstream Merge Chromium at r11.0.672.0: Fix Makefiles. Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.cc Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.cc Merge Chromium at r11.0.672.0: Fix conflicts in personal_data_manager.cc Merge Chromium at r11.0.672.0: Fix conflicts in autofill_manager.* Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.cc Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.h Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.h Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.cc Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.cc Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.cc Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.h Merge Chromium at r11.0.672.0: Fix conflicts in net_util.cc Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc Merge Chromium at r11.0.672.0: Fix conflicts in logging.cc Merge Chromium.org at r11.0.672.0: Initial merge by git. Reduce pref usage by autofill File not used, matching upstream to avoid conflicts.
| * Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.ccKristian Monsen2011-06-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | A lot of functionality was introduced to the WINDOWS version, which we were using. Creating a new Android path that matches the old Windows and Android path. CL: http://codereview.chromium.org/6180001 Change-Id: Icc88f69ea092adc1f0f5fa7166bb669499096259
| * Merge Chromium at r11.0.672.0: Compile fix in android_network_library.ccKristian Monsen2011-06-141-1/+4
| | | | | | | | | | | | | | Files moved in this upstream CL: http://codereview.chromium.org/5091005 Change-Id: Ifa32ffeb67c4126b79aef8d2f9a966c5240eca43
| * Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.ccKristian Monsen2011-06-141-23/+4
| | | | | | | | | | | | | | | | | | Large refactoring upstream: http://codereview.chromium.org/6382003 Will look at removing the local edit after the merge. Change-Id: I9547a3c82e9a4193d854f306c8374dd82ad2ae43
| * Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.ccKristian Monsen2011-06-141-3/+3
| | | | | | | | | | | | | | Got the cherry pick for keep-alive, added guards around local Android edit. http://codereview.chromium.org/6162005 Change-Id: I55c66cce1888dd195e14c7f932a651fda919d405
| * Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.ccKristian Monsen2011-06-141-38/+8
| | | | | | | | | | | | | | | | | | 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
| * Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.hKristian Monsen2011-06-141-6/+1
| | | | | | | | | | | | | | New comment close to local edit in CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_proxy_client_socket.h?view=diff&pathrev=74924&r1=71879&r2=71880 Change-Id: Ibfb86a744ebb2172009bf0a8cce8bee62ddc7275
| * Merge Chromium at r11.0.672.0: Fix conflicts in net_util.ccKristian Monsen2011-06-141-4/+0
| | | | | | | | | | | | | | Include removed in CL: http://codereview.chromium.org/6394004 Change-Id: I8a0c21f69be740705b6dedaaaccb4615deb878c6
| * Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14343-15076/+13246
| | | | | | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* | 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
| | | | | | | | | | | | | | | | | | Find("SpdyCwnd") is sometimes coming back null. This guards against that case. http://codereview.chromium.org/6877124/ Change-Id: Ic6da3c39049397b7e430797a43ab0df30df277d2
* | Increase EVP_PKEY reference count before passing value to OpenSSLBrian Carlstrom2011-06-091-0/+1
|/ | | | Change-Id: I97a4b1109bb953427216efde1904c7084f47ef2a
* Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't ↵Kristian Monsen2011-05-312-2/+11
| | | | | | | | | | | | | | | | bypass proxy Adding blacklist handling to chromium. Splitting the string around "," for several entries. To blacklist all subdomains use *, f.ex. *cnn.com. Needs CL in external/webkit: https://android-git.corp.google.com/g/#change,112401 Needs CL in frameworks/base: https://android-git.corp.google.com/g/#change,112400 Change-Id: Ifbbb499bc4cb4da2d63e3ca4d56e6395ad747afc
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25166-1571/+2311
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Removing the NullProxy, better Android implementationKristian Monsen2011-05-231-14/+5
| | | | | | The NullProxy was not used anymore. Change-Id: I53e91650229e1b20e4376a13080e6681abd5c0a6
* Remove local changes in unused proxy_config_service_linux.hKristian Monsen2011-05-231-2/+0
| | | | | | We don't even compile this file anymore. Change-Id: Ia924ea7c9d829e175a351fa789893f5e93b07c13
* Merge Chromium at 10.0.621.0: Fix conflict in url_request_http_job.ccKristian Monsen2011-05-201-5/+1
| | | | | | | Upstream patch close to local patch: http://codereview.chromium.org/5682009 Change-Id: Id3f7909fc8389e208d165025baafb1267968e847
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_client_socket_pool.ccKristian Monsen2011-05-201-7/+2
| | | | | | | Local change close to upstream change: http://codereview.chromium.org/5386001 Change-Id: I9f4e10300fc7dc127a4c4984254606ad777e01b1
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_host_info.ccKristian Monsen2011-05-201-10/+0
| | | | | | | | Local patch in code that was removed. http://src.chromium.org/viewvc/chrome?view=rev&revision=69262 Change-Id: I6f0821edb2a62234964a1e693b5e96d24db8605a
* Merge Chromium at 10.0.621.0: Fix conflict in ssl_client_socket_openssl.*Kristian Monsen2011-05-202-79/+0
| | | | | | | | | | | | | Just conflicts with getting our local patch that was upstreamed merged back again. Mostly conflicts with this CL: http://codereview.chromium.org/5528003/ We are now matching upstream, except for some unrelated changes that are marked with Android and upstreamed. Change-Id: Ib799541294cef8025ac9786197183839abaa44fe
* Merge Chromium at 10.0.621.0: Fix conflict in http_proxy_client_socket.ccKristian Monsen2011-05-202-17/+7
| | | | | | | | | | 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
* Merge Chromium at 10.0.621.0: Fix conflict in des.ccKristian Monsen2011-05-201-7/+0
| | | | | | | | | Just removing Android guards when getting the upstream patch. Upstream CL: http://codereview.chromium.org/5195001 Change-Id: Ia38e2ff78cf7bb3ae14910da3ed7bd063a9dcad0
* Merge Chromium at 10.0.621.0: Fix conflict in cookie_monster.*Kristian Monsen2011-05-162-21/+0
| | | | | | | | | Conflicts from: http://codereview.chromium.org/5365010 Which was upstreaming the patch. Change-Id: Ic28f15156ec57630123e22dcf02f865e9aeef41d
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16333-4342/+8434
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* am 47c0a16e: Removing projects that are not needed to compileKristian Monsen2011-03-3077-45322/+0
|\ | | | | | | | | * commit '47c0a16e8b9f5c6cfb515871409697aa20236ed5': Removing projects that are not needed to compile
| * Removing projects that are not needed to compileKristian Monsen2011-03-3077-45322/+0
| | | | | | | | | | Bug: 4194380 Change-Id: Idf9ea7c893786dc3cb7ad869563679e1c8c56aed
* | Reduce the TCP Keep Alive intervalBen Murdoch2011-03-251-1/+1
| | | | | | | | | | | | | | | | Reduce the TCP Keep Alive timeout and interval to prevent the page hanging when routers aggressively terminate connections Bug: 4107114 Change-Id: Iea35d47e32a025be2f63095d0f380e1e4fed4faf
* | Cherry pick Chrome r71482Ben Murdoch2011-03-221-0/+24
| | | | | | | | | | | | | | Implement TCP keep alive packets. Bug: 4107114 Change-Id: I7b5f1610c79002a8f97f39d51d557d85f390b997
* | Fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-1125-27/+203
| | | | | | | | | | | | | | | | | | | | 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
* | Chromium part of fix for bug 3491968 Browser frozen on dunkindonuts.comKristian Monsen2011-03-0912-9/+128
| | | | | | | | | | | | | | | | 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
* | Updating the des code, mostly just proper castsKristian Monsen2011-03-031-6/+11
| | | | | | | | Change-Id: I9fd913e6d41f35ce0df0080d5deae14ac04e1d42
* | Fix for bug 2386130 VZW:PP659: login issues on some ↵Kristian Monsen2011-03-031-10/+10
| | | | | | | | | | | | | | | | | | | | sites:http://traffic.cumulus.com - LIBtt61764 (NTLM support) do not merge Tested with the test site from the bug. Looks like it works! Cherry picked from master Change-Id: I795128a1c50d10e8c23d9d5fb70362853355485d
* | Importing two ssl_client_socket_openssl.cc patches from upstream chromiumBrian Carlstrom2011-03-011-14/+45
| | | | | | | | | | | | | | | | | | | | Remove SSL 2.0 support. patch -p0 < http://codereview.chromium.org/download/issue4091005_34002_63023.diff Add support for some advanced SLL modes & options (where present) patch -p1 < http://codereview.chromium.org/download/issue5451001_1_2.diff Bug: 3492073
* | Fix for bug 3435888 Native crash in BrowserKristian Monsen2011-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | It looks like the Android getaddrinfo sometimes does not set the addrinfo structure and does not return an error. This should make sure we do not crash if that happens. The native part of the java net library also checks for 0 here: http://android.git.kernel.org/?p=platform/libcore.git;a=blob;f=luni/src/main/native/java_net_InetAddress.cpp;h=8c810752cd15825bea9974fe1ec00558e1dd3685;hb=HEAD Change-Id: I2ac14cf58905448661cc4f932373ed7dbddf70ff
* | Merge Chromium at 9.0.597.106Steve Block2011-02-181-0/+3
| | | | | | | | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
generated by cgit v1.1 at 2024-12-22 14:53:51 +0000