summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-03-22 21:13:13 +0100
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2010-03-22 21:13:13 +0100
commit76871374d39fa028d95a0430d169bae96e911823 (patch)
treee115de9e5976badb47be18530516dfc0180ccc52
parentcore ssl fix, nginx support, https for lighttpd and nginx (diff)
downloadpyload-76871374d39fa028d95a0430d169bae96e911823.tar.xz
netload fix
-rw-r--r--module/plugins/hoster/NetloadIn.py2
-rw-r--r--systemCheck.py13
2 files changed, 9 insertions, 6 deletions
diff --git a/module/plugins/hoster/NetloadIn.py b/module/plugins/hoster/NetloadIn.py
index 67753a7b7..278e9ce87 100644
--- a/module/plugins/hoster/NetloadIn.py
+++ b/module/plugins/hoster/NetloadIn.py
@@ -101,7 +101,7 @@ class NetloadIn(Plugin):
sleep(5)
self.html[2] = self.req.load("http://netload.in/index.php?id=10", post={"file_id": file_id, "captcha_check": captcha}, cookies=True)
- if re.search(r"(We will prepare your download..|We had a request with the IP)", self.html[2]) != None:
+ if re.search(r"(We will prepare your download..|We had a reqeust with the IP)", self.html[2]) != None:
return True
raise Exception("Captcha not decrypted")
diff --git a/systemCheck.py b/systemCheck.py
index 60daaa514..7f78ec896 100644
--- a/systemCheck.py
+++ b/systemCheck.py
@@ -153,16 +153,19 @@ def main():
web_err.append("Please run: python %s syncdb" % join(dirname(__file__), "module", "web", "manage.py"))
try:
- p = subprocess.call(["lighttpd", "-v"], stdout=pipe, stderr=pipe)
+ import flup
except:
- web_info.append("Install lighttpd if you want an highperformance webserver.")
+ web_info.append("Install Flup to use FastCGI or optional webservers.")
try:
- import flup
+ p = subprocess.call(["lighttpd", "-v"], stdout=pipe, stderr=pipe)
except:
- web_info.append("Install Flup to use FastCGI and lighttpd.")
-
+ web_info.append("Install lighttpd as optional webserver.")
+ try:
+ p = subprocess.call(["nginx", "-v"], stdout=pipe, stderr=pipe)
+ except:
+ web_info.append("Install nginx as optional webserver.")
if web_err:
print "The system check has detected some errors:"