From 68cd25bf99c2846d3a446d2b5722d3a43c727b21 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sun, 22 Sep 2013 09:12:51 +1000 Subject: [PATCH] Made timeout configurable per driver --- .gitignore | 8 ++++++-- drivers/php/js/driver.js | 1 + links.sh | 34 +++++++++++++++++----------------- share/js/wappalyzer.js | 6 +++--- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index c0f723cee..a521d03f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ wappalyzer-chrome.zip wappalyzer-firefox.xpi -.windows_zip/* -!.windows_zip/Download 7-Zip.hta \ No newline at end of file + +drivers/**/apps.json +drivers/**/wappalyzer.js +drivers/**/icons/*.png + +drivers/firefox-jetpack/data diff --git a/drivers/php/js/driver.js b/drivers/php/js/driver.js index 36a8a385c..91416520c 100644 --- a/drivers/php/js/driver.js +++ b/drivers/php/js/driver.js @@ -3,6 +3,7 @@ var w = wappalyzer; w.driver = { debug: false, data: {}, + timeout: 5000, /** * Log messages to console diff --git a/links.sh b/links.sh index b584941f8..48a179a1a 100755 --- a/links.sh +++ b/links.sh @@ -1,24 +1,24 @@ #!/bin/sh -ln -f share/images/icons drivers/firefox/skin/images/icons -ln -f share/apps.json drivers/firefox/content -ln -f share/js/wappalyzer.js drivers/firefox/content/js +ln -f share/images/icons/*.png drivers/firefox/skin/images/icons +ln -f share/apps.json drivers/firefox/content +ln -f share/js/wappalyzer.js drivers/firefox/content/js -ln -f share/images/icons drivers/firefox-jetpack/images/icons -ln -f share/apps.json drivers/firefox-jetpack/data -ln -f share/js/wappalyzer.js drivers/firefox-jetpack/lib +ln -f share/images/icons/*.png drivers/firefox-jetpack/images/icons +ln -f share/apps.json drivers/firefox-jetpack/data +ln -f share/js/wappalyzer.js drivers/firefox-jetpack/lib -ln -f share/images/icons drivers/chrome/images/icons -ln -f share/apps.json drivers/chrome -ln -f share/js/wappalyzer.js drivers/chrome/js +ln -f share/images/icons/*.png drivers/chrome/images/icons +ln -f share/apps.json drivers/chrome +ln -f share/js/wappalyzer.js drivers/chrome/js -ln -f share/images/icons drivers/bookmarklet/images/icons -ln -f share/apps.json drivers/bookmarklet/json -ln -f share/js/wappalyzer.js drivers/bookmarklet/js +ln -f share/images/icons/*.png drivers/bookmarklet/images/icons +ln -f share/apps.json drivers/bookmarklet/json +ln -f share/js/wappalyzer.js drivers/bookmarklet/js -ln -f share/images/icons drivers/html/images/icons -ln -f share/apps.json drivers/html -ln -f share/js/wappalyzer.js drivers/html/js +ln -f share/images/icons/*.png drivers/html/images/icons +ln -f share/apps.json drivers/html +ln -f share/js/wappalyzer.js drivers/html/js -ln -f share/apps.json drivers/php -ln -f share/js/wappalyzer.js drivers/php/js +ln -f share/apps.json drivers/php +ln -f share/js/wappalyzer.js drivers/php/js diff --git a/share/js/wappalyzer.js b/share/js/wappalyzer.js index 6f8701db0..1247cd5c1 100644 --- a/share/js/wappalyzer.js +++ b/share/js/wappalyzer.js @@ -1,7 +1,7 @@ /** * Wappalyzer v2 * - * Created by Elbert F + * Created by Elbert Alias * * License: GPLv3 http://www.gnu.org/licenses/gpl-3.0.txt */ @@ -130,7 +130,7 @@ var wappalyzer = (function() { this.regexCount++; this.lastTime = new Date().getTime(); - this.timedOut = this.getDuration() > 1000; + this.timedOut = this.getDuration() > ( w.driver.timeout || 1000 ); }, getDuration: function() { @@ -210,7 +210,7 @@ var wappalyzer = (function() { environment: 'dev', // dev | live websiteURL: 'http://wappalyzer.com/', twitterURL: 'https://twitter.com/Wappalyzer', - githubURL: 'https://github.com/ElbertF/Wappalyzer', + githubURL: 'https://github.com/ElbertF/Wappalyzer' }, /**