Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added initial iOS User-Agent

Browse source
This commit is contained in:
Jonathan Jayet 2017-08-23 20:46:57 +02:00
parent e61a043a56
commit 17cf44022f
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/config/opts.rs
View file

@ -448,6 +448,7 @@ pub fn multiprocess() -> bool {
enum UserAgent { enum UserAgent {
Desktop, Desktop,
Android, Android,
iOS
} }
fn default_user_agent_string(agent: UserAgent) -> &'static str { fn default_user_agent_string(agent: UserAgent) -> &'static str {
@ -478,13 +479,19 @@ fn default_user_agent_string(agent: UserAgent) -> &'static str {
UserAgent::Android => { UserAgent::Android => {
"Mozilla/5.0 (Android; Mobile; rv:55.0) Servo/1.0 Firefox/55.0" "Mozilla/5.0 (Android; Mobile; rv:55.0) Servo/1.0 Firefox/55.0"
} }
UserAgent::iOS => {
"Mozilla/5.0 (iPhone; CPU iPhone OS 8_3 like Mac OS X; rv:55.0) Servo/1.0 Firefox/55.0"
}
} }
} }
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
const DEFAULT_USER_AGENT: UserAgent = UserAgent::Android; const DEFAULT_USER_AGENT: UserAgent = UserAgent::Android;
#[cfg(not(target_os = "android"))] #[cfg(target_os = "ios")]
const DEFAULT_USER_AGENT: UserAgent = UserAgent::iOS;
#[cfg(not(any(target_os = "android", target_os = "ios")))]
const DEFAULT_USER_AGENT: UserAgent = UserAgent::Desktop; const DEFAULT_USER_AGENT: UserAgent = UserAgent::Desktop;
pub fn default_opts() -> Opts { pub fn default_opts() -> Opts {
@ -584,7 +591,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
opts.optopt("", "resolution", "Set window resolution.", "1024x740"); opts.optopt("", "resolution", "Set window resolution.", "1024x740");
opts.optopt("u", opts.optopt("u",
"user-agent", "user-agent",
"Set custom user agent string (or android / desktop for platform default)", "Set custom user agent string (or ios / android / desktop for platform default)",
"NCSA Mosaic/1.0 (X11;SunOS 4.1.4 sun4m)"); "NCSA Mosaic/1.0 (X11;SunOS 4.1.4 sun4m)");
opts.optflag("M", "multiprocess", "Run in multiprocess mode"); opts.optflag("M", "multiprocess", "Run in multiprocess mode");
opts.optflag("S", "sandbox", "Run in a sandbox if multiprocess"); opts.optflag("S", "sandbox", "Run in a sandbox if multiprocess");
@ -766,6 +773,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
} }
let user_agent = match opt_match.opt_str("u") { let user_agent = match opt_match.opt_str("u") {
Some(ref ua) if ua == "ios" => default_user_agent_string(UserAgent::iOS).into(),
Some(ref ua) if ua == "android" => default_user_agent_string(UserAgent::Android).into(), Some(ref ua) if ua == "android" => default_user_agent_string(UserAgent::Android).into(),
Some(ref ua) if ua == "desktop" => default_user_agent_string(UserAgent::Desktop).into(), Some(ref ua) if ua == "desktop" => default_user_agent_string(UserAgent::Desktop).into(),
Some(ua) => ua.into(), Some(ua) => ua.into(),