Revert last commit

bdamele · bdamele · commit 3b3353e05b22 · 2010-03-16T13:56:36.000Z
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
@@ -31,8 +31,6 @@
 from lib.controller.checks import checkConnection
 from lib.core.common import paramToDict
 from lib.core.common import parseTargetUrl
-from lib.core.common import pop
-from lib.core.common import push
 from lib.core.common import readInput
 from lib.core.data import conf
 from lib.core.data import kb
@@ -105,10 +103,6 @@ def start():
     if kb.targetUrls and len(kb.targetUrls) > 1:
         infoMsg = "sqlmap got a total of %d targets" % len(kb.targetUrls)
         logger.info(infoMsg)
-        
-    if conf.multipleTargets:
-        push(conf.raise404)
-        conf.raise404 = False
 
     hostCount               = 0
     cookieStr               = ""
@@ -273,12 +267,7 @@ def start():
                 logger.error(e)
             else:
                 logger.error(e)
-                if conf.multipleTargets:
-                    conf.raise404 = pop()
                 return
 
-    if conf.multipleTargets:
-        conf.raise404 = pop()
-
     if conf.loggedToOut:
         logger.info("Fetched data logged to text files under '%s'" % conf.outputPath)
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -939,9 +939,3 @@ def posixToNtSlashes(filepath):
 
 def ntToPosixSlashes(filepath):
     return filepath.replace('\\', '/')
-
-def push(value):
-    conf.stack.append(value)
-
-def pop():
-    return conf.stack.pop()
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -957,14 +957,12 @@ def __setConfAttributes():
     conf.path            = None
     conf.port            = None
     conf.progressWidth   = 54
-    conf.raise404        = True
     conf.retriesCount    = 0
     conf.scheme          = None
     #conf.seqMatcher      = difflib.SequenceMatcher(lambda x: x in " \t")
     conf.seqMatcher      = difflib.SequenceMatcher(None)
     conf.seqLock         = None
     conf.sessionFP       = None
-    conf.stack           = []
     conf.start           = True
     conf.threadContinue  = True
     conf.threadException = False
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -70,7 +70,7 @@ def getPage(**kwargs):
         direct    = kwargs.get('direct',    False)
         multipart = kwargs.get('multipart', False)
         silent    = kwargs.get('silent',    False)
-        raise404  = kwargs.get('raise404',  None)
+        raise404  = kwargs.get('raise404',  True)
 
         page            = ""
         cookieStr       = ""
@@ -181,7 +181,7 @@ def getPage(**kwargs):
                 errMsg  = "not authorized, try to provide right HTTP "
                 errMsg += "authentication type and valid credentials"
                 raise sqlmapConnectionException, errMsg
-            elif e.code == 404 and (raise404 or (raise404 is None and conf.raise404)):
+            elif e.code == 404 and raise404:
                 errMsg = "page not found"
                 raise sqlmapConnectionException, errMsg
             else:
