| OLD | NEW |
|---|
| (Empty) |
| 1 [ | |
| 2 { "ONC_ProxySettings": { | |
| 3 "Manual": { | |
| 4 "FTPProxy": { | |
| 5 "Host": "192.168.2.1", | |
| 6 "Port": 8889 | |
| 7 }, | |
| 8 "HTTPProxy": { | |
| 9 "Host": "192.168.2.1", | |
| 10 "Port": 8889 | |
| 11 }, | |
| 12 "SOCKS": { | |
| 13 "Host": "192.168.2.1", | |
| 14 "Port": 8889 | |
| 15 }, | |
| 16 "SecureHTTPProxy": { | |
| 17 "Host": "192.168.2.1", | |
| 18 "Port": 8889 | |
| 19 } | |
| 20 }, | |
| 21 "Type": "Manual" | |
| 22 }, | |
| 23 "ProxyConfig": { | |
| 24 "mode":"fixed_servers", | |
| 25 "server":"ftp=192.168.2.1:8889;http=192.168.2.1:8889;socks=socks4://192.16
8.2.1:8889;https=192.168.2.1:8889" | |
| 26 } | |
| 27 }, | |
| 28 { | |
| 29 "ONC_ProxySettings": { | |
| 30 "Type": "Manual", | |
| 31 "Manual": { | |
| 32 "HTTPProxy" : { | |
| 33 "Host" : "http.example.com", | |
| 34 "Port" : 1234 | |
| 35 }, | |
| 36 "SecureHTTPProxy" : { | |
| 37 "Host" : "https.example.com", | |
| 38 "Port" : 3456 | |
| 39 }, | |
| 40 "FTPProxy" : { | |
| 41 "Host" : "ftp.example.com", | |
| 42 "Port" : 5678 | |
| 43 }, | |
| 44 "SOCKS" : { | |
| 45 "Host" : "socks5://socks.example.com", | |
| 46 "Port" : 7890 | |
| 47 } | |
| 48 }, | |
| 49 "ExcludeDomains": [ | |
| 50 "google.com", | |
| 51 "<local>" | |
| 52 ] | |
| 53 }, | |
| 54 "ProxyConfig": { | |
| 55 "bypass_list":"google.com;\u003Clocal\u003E;", | |
| 56 "mode":"fixed_servers", | |
| 57 "server":"ftp=ftp.example.com:5678;http=http.example.com:1234;socks=socks5
://socks.example.com:7890;https=https.example.com:3456" | |
| 58 } | |
| 59 }, | |
| 60 { "ONC_ProxySettings": { | |
| 61 "Type": "PAC", | |
| 62 "PAC": "https://proxycfg.my.domain.com/proxy.dat" | |
| 63 }, | |
| 64 "ProxyConfig": { | |
| 65 "mode":"pac_script", | |
| 66 "pac_mandatory":false, | |
| 67 "pac_url":"https://proxycfg.my.domain.com/proxy.dat" | |
| 68 } | |
| 69 }, | |
| 70 { "ONC_ProxySettings": { | |
| 71 "Type": "WPAD" | |
| 72 }, | |
| 73 "ProxyConfig": { | |
| 74 "mode": "auto_detect" | |
| 75 } | |
| 76 }, | |
| 77 { "ONC_ProxySettings": { | |
| 78 "Type": "Direct" | |
| 79 }, | |
| 80 "ProxyConfig": { | |
| 81 "mode": "direct" | |
| 82 } | |
| 83 } | |
| 84 ] | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1228543002:
Translate ONC ProxySettings <-> Shill ProxyConfig (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master