| 42a0b512b27badd0d560042d40f00d2b782c416f |
10-Nov-2014 |
Selim Gurun <sgurun@google.com> |
Do not ignore proxy bypass settings
Bug: 18312952
Cherry pick upstream change https://codereview.chromium.org/421493002/
to fix the proxy bypass bug. Without this fix chrome net stack will
ignore proxy bypass settings.
Change-Id: I1d3ed05bc737cc49fe0e6a1c249b65525f418506
ava/src/org/chromium/net/ProxyChangeListener.java
|
| 1320f92c476a1ad9d19dba2a48c72b75566198e9 |
30-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
ava/src/org/chromium/net/NetStringUtil.java
ava/src/org/chromium/net/ProxyChangeListener.java
ava/src/org/chromium/net/X509Util.java
eystore_openssl.cc
eystore_openssl.h
eystore_unittest.cc
|
| 03b57e008b61dfcb1fbad3aea950ae0e001748b0 |
28-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
eystore_openssl.cc
|
| 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
ava/src/org/chromium/net/ProxyChangeListener.java
|
| 5f1c94371a64b3196d4be9466099bb892df9b88e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ava/src/org/chromium/net/ProxyChangeListener.java
eystore_openssl.cc
eystore_unittest.cc
|
| 116680a4aac90f2aa7413d9095a592090648e557 |
21-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ava/src/org/chromium/net/AndroidKeyStore.java
ava/src/org/chromium/net/DefaultAndroidKeyStore.java
ava/src/org/chromium/net/RemoteAndroidKeyStore.java
eystore.cc
eystore.h
eystore_openssl.cc
eystore_unittest.cc
egacy_openssl.h
|
| 6d86b77056ed63eb6871182f42a9fd5f07550f90 |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
eystore_openssl.cc
|
| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
WNERS
eystore_unittest.cc
|
| 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd |
09-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/X509Util.java
etwork_change_notifier_delegate_android.cc
|
| cedac228d2dd51db4b79ea1e72c7f249408ee061 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ava/src/org/chromium/net/NetStringUtil.java
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/X509Util.java
et_jni_registrar.cc
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
ava/src/org/chromium/net/AndroidNetworkLibrary.java
etwork_library.cc
etwork_library.h
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ava/src/org/chromium/net/DefaultAndroidKeyStore.java
|
| c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ava/src/org/chromium/net/X509Util.java
|
| a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 |
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ava/src/org/chromium/net/AndroidKeyStore.java
ava/src/org/chromium/net/DefaultAndroidKeyStore.java
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/RemoteAndroidKeyStore.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/NetworkChangeNotifierTest.java
eystore.cc
|
| 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 |
21-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ndroid_private_key.cc
ndroid_private_key.h
ert_verify_result_android.cc
ert_verify_result_android.h
ert_verify_result_android_list.h
ert_verify_status_android_list.h
ava/CertVerifyResultAndroid.template
ava/CertVerifyStatusAndroid.template
ava/src/org/chromium/net/AndroidCertVerifyResult.java
ava/src/org/chromium/net/AndroidKeyStore.java
ava/src/org/chromium/net/AndroidNetworkLibrary.java
ava/src/org/chromium/net/AndroidPrivateKey.java
ava/src/org/chromium/net/DefaultAndroidKeyStore.java
ava/src/org/chromium/net/IRemoteAndroidKeyStore.aidl
ava/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl
ava/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/RemoteAndroidKeyStore.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
avatests/src/org/chromium/net/NetworkChangeNotifierTest.java
avatests/src/org/chromium/net/X509UtilTest.java
eystore.cc
eystore.h
eystore_openssl.cc
et_jni_registrar.cc
etwork_change_notifier_android.cc
etwork_change_notifier_android.h
etwork_library.cc
etwork_library.h
|
| a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 |
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ava/src/org/chromium/net/AndroidKeyStore.java
ava/src/org/chromium/net/AndroidNetworkLibrary.java
ava/src/org/chromium/net/GURLUtils.java
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/ProxyChangeListener.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
avatests/src/org/chromium/net/AndroidProxySelectorTest.java
avatests/src/org/chromium/net/NetErrorsTest.java
avatests/src/org/chromium/net/NetworkChangeNotifierTest.java
avatests/src/org/chromium/net/X509UtilTest.java
eystore_unittest.cc
|
| f2477e01787aa58f445919b809d89e252beef54f |
28-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/ProxyChangeListener.java
etwork_change_notifier_delegate_android.cc
|
| 1e9bf3e0803691d0a228da41fc608347b6db4340 |
31-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/ProxyChangeListener.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/X509UtilTest.java
et_jni_registrar.cc
|
| 68043e1e95eeb07d5cae7aca370b26518b0867d6 |
26-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ava/src/org/chromium/net/AndroidNetworkLibrary.java
|
| d0247b1b59f9c528cb6df88b4f2b9afaf80d181e |
19-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 224184
This commit was generated by merge_to_master.py.
Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
eystore_openssl.cc
|
| 58537e28ecd584eab876aee8be7156509866d23a |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ava/src/org/chromium/net/AndroidKeyStore.java
eystore_openssl.cc
|
| 9ab5563a3196760eb381d102cbb2bc0f7abc6a50 |
18-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212225
This commit was generated by merge_to_master.py.
Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ava/src/org/chromium/net/AndroidNetworkLibrary.java
ava/src/org/chromium/net/X509Util.java
etwork_change_notifier_android_unittest.cc
|
| 7dbb3d5cf0c15f500944d211057644d6a2f37371 |
17-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
url_utils.cc
|
| eb525c5499e34cc9c4b825d6d9e75bb07cc06ace |
10-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
avatests/src/org/chromium/net/X509UtilTest.java
|
| 7d4cd473f85ac64c3747c96c277f9e506a0d2246 |
19-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ert_verify_result_android_list.h
|
| 5e3f23d412006dc4db4e659864679f29341e113f |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205548
This commit was generated by merge_to_master.py.
Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
eystore_unittest.cc
|
| 90dce4d38c5ff5333bea97d859d4e484e27edf0c |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
etwork_change_notifier_android_unittest.cc
|
| b2df76ea8fec9e32f6f3718986dba0d95315b29c |
13-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
WNERS
url_utils.cc
ava/src/org/chromium/net/GURLUtils.java
|
| c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d |
09-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
ert_verify_result_android_list.h
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/X509UtilTest.java
eystore.h
|
| 2a99a7e74a7f215066514fe81d2bfa6639d9eddd |
28-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
ert_verify_result_android.h
ert_verify_result_android_list.h
url_utils.cc
url_utils.h
ava/CertVerifyResultAndroid.template
ava/CertificateMimeType.template
ava/NetError.template
ava/PrivateKeyType.template
ava/net_errors_java.template
ava/src/org/chromium/net/AndroidKeyStore.java
ava/src/org/chromium/net/AndroidNetworkLibrary.java
ava/src/org/chromium/net/GURLUtils.java
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
avatests/src/org/chromium/net/AndroidProxySelectorTest.java
avatests/src/org/chromium/net/NetworkChangeNotifierTest.java
eystore.cc
eystore.h
eystore_openssl.cc
eystore_openssl.h
eystore_unittest.cc
et_jni_registrar.cc
etwork_change_notifier_android.cc
etwork_change_notifier_android.h
etwork_change_notifier_android_unittest.cc
etwork_change_notifier_delegate_android.cc
etwork_change_notifier_delegate_android.h
etwork_change_notifier_factory_android.cc
etwork_change_notifier_factory_android.h
etwork_library.cc
etwork_library.h
rivate_key_type_list.h
ools/proxy_test_cases.py
|
| 5821806d5e7f356e8fa4b058a389a808ea183019 |
14-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r167172
This commit was generated by merge_to_master.py.
Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
WNERS
ava/net_errors_java.template
ava/src/org/chromium/net/AndroidNetworkLibrary.java
ava/src/org/chromium/net/NetworkChangeNotifier.java
ava/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
ava/src/org/chromium/net/ProxyChangeListener.java
ava/src/org/chromium/net/X509Util.java
avatests/src/org/chromium/net/AndroidProxySelectorTest.java
avatests/src/org/chromium/net/NetErrorsTest.java
avatests/src/org/chromium/net/NetworkChangeNotifierTest.java
et_jni_registrar.cc
et_jni_registrar.h
etwork_change_notifier_android.cc
etwork_change_notifier_android.h
etwork_change_notifier_android_unittest.cc
etwork_change_notifier_factory_android.cc
etwork_change_notifier_factory_android.h
etwork_library.cc
etwork_library.h
ools/proxy_test_cases.py
|