diff --git a/src/ua-parser.js b/src/ua-parser.js index d469a49..1bccc17 100755 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -374,10 +374,8 @@ /(?:(amd|x(?:(?:86|64)[-_])?|wow|win)64)[;\)]/i // AMD64 (x64) ], [[ARCHITECTURE, 'amd64']], [ - /(ia32(?=;))/i // IA32 (quicktime) - ], [[ARCHITECTURE, lowerize]], [ - - /((?:i[346]|x)86)[;\)]/i // IA32 (x86) + /(ia32(?=;))/i, // IA32 (quicktime) + /\b((i[346]|x)86)(pc)?\b/i // IA32 (x86) ], [[ARCHITECTURE, 'ia32']], [ /\b(aarch64|arm(v?8e?l?|_?64))\b/i // ARM64 diff --git a/test/cpu-test.json b/test/cpu-test.json index c3325b6..2e3da2c 100644 --- a/test/cpu-test.json +++ b/test/cpu-test.json @@ -246,5 +246,21 @@ { "architecture" : "irix64" } + }, + { + "desc" : "68k", + "ua" : "'Mozilla/1.1 (Macintosh; U; 68K)'", + "expect" : + { + "architecture" : "68k" + } + }, + { + "desc" : "x86", + "ua" : "Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:1.8.1.20) Gecko/20090127 BonEcho/2.0.0.20", + "expect" : + { + "architecture" : "ia32" + } } ]