diff options
| author | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-05-03 19:29:53 +0000 |
|---|---|---|
| committer | dominique.leuenberger@gmail.com <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56> | 2011-05-03 19:29:53 +0000 |
| commit | 274431901fc076dc94418287eb0bdf19d20b4f9c (patch) | |
| tree | 56d7301a6871bb0368e786907bd884d287ff56a4 | |
| parent | 42370def350512ecf2339ff44cf5308d7552c2c6 (diff) | |
| download | libproxy-274431901fc076dc94418287eb0bdf19d20b4f9c.tar.gz | |
pacutils: syncing function isInNet() (bmo#646509) and dateRange (bmo#419510) with mozilla source
git-svn-id: http://libproxy.googlecode.com/svn/trunk@807 c587cffe-e639-0410-9787-d7902ae8ed56
| -rw-r--r-- | libproxy/modules/pacutils.h | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/libproxy/modules/pacutils.h b/libproxy/modules/pacutils.h index 2a1fdef..3826014 100644 --- a/libproxy/modules/pacutils.h +++ b/libproxy/modules/pacutils.h @@ -58,21 +58,22 @@ " (bytes[3] & 0xff);\n" \ " return result;\n" \ "}\n" \ -"function isInNet(ipaddr, pattern, maskstr) {\n" \ -" var test = /^(\\d{1,4})\\.(\\d{1,4})\\.(\\d{1,4})\\.(\\d{1,4})$/(ipaddr);\n" \ -" if (test == null) {\n" \ -" ipaddr = dnsResolve(ipaddr);\n" \ -" if (ipaddr == null)\n" \ -" return false;\n" \ -" } else if (test[1] > 255 || test[2] > 255 ||\n" \ -" test[3] > 255 || test[4] > 255) {\n" \ -" return false;\n" \ -" }\n" \ -" var host = convert_addr(ipaddr);\n" \ -" var pat = convert_addr(pattern);\n" \ -" var mask = convert_addr(maskstr);\n" \ -" return ((host & mask) == (pat & mask));\n" \ -"}\n" \ +"function isInNet(ipaddr, pattern, maskstr) {\n"\ +" var test = /^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$/.exec(ipaddr);\n"\ +" if (test == null) {\n"\ +" ipaddr = dnsResolve(ipaddr);\n"\ +" if (ipaddr == null)\n"\ +" return false;\n"\ +" } else if (test[1] > 255 || test[2] > 255 || \n"\ +" test[3] > 255 || test[4] > 255) {\n"\ +" return false; // not an IP address\n"\ +" }\n"\ +" var host = convert_addr(ipaddr);\n"\ +" var pat = convert_addr(pattern);\n"\ +" var mask = convert_addr(maskstr);\n"\ +" return ((host & mask) == (pat & mask));\n"\ +" \n"\ +"}\n"\ "function isPlainHostName(host) {\n" \ " return (host.search('\\\\.') == -1);\n" \ "}\n" \ @@ -95,13 +96,12 @@ " var newRe = new RegExp('^'+pattern+'$');\n" \ " return newRe.test(url);\n" \ "}\n" \ -"var wdays = new Array('SUN', 'MON', 'TUE', 'WED', 'THU', 'FRI', 'SAT');\n" \ -"var monthes = new Array('JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC');\n" \ +"var wdays = {SUN: 0, MON: 1, TUE: 2, WED: 3, THU: 4, FRI: 5, SAT: 6};\n" \ +"var months = {JAN: 0, FEB: 1, MAR: 2, APR: 3, MAY: 4, JUN: 5, JUL: 6, AUG: 7, SEP: 8, OCT: 9, NOV: 10, DEC: 11};\n"\ "function weekdayRange() {\n" \ " function getDay(weekday) {\n" \ -" for (var i = 0; i < 6; i++) {\n" \ -" if (weekday == wdays[i])\n" \ -" return i;\n" \ +" if (weekday in wdays) {\n" \ +" return wdays[weekday];\n" \ " }\n" \ " return -1;\n" \ " }\n" \ @@ -123,9 +123,8 @@ "}\n" \ "function dateRange() {\n" \ " function getMonth(name) {\n" \ -" for (var i = 0; i < 6; i++) {\n" \ -" if (name == monthes[i])\n" \ -" return i;\n" \ +" if (name in months) {\n" \ +" return months[name];\n" \ " }\n" \ " return -1;\n" \ " }\n" \ |