From d40a238335518010a9b49eeb26de62d3acaa7ac7 Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Wed, 30 Jun 2010 11:29:35 +0000
Subject: [PATCH] Make --keep-alive public

---
 doc/ChangeLog          | 2 ++
 lib/core/optiondict.py | 1 +
 lib/parse/cmdline.py   | 6 +++---
 sqlmap.conf            | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9814caafe..8730e9210 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -10,6 +10,8 @@ sqlmap (0.9-1) stable; urgency=low
     (Bernardo).
   * Added support to fetch unicode data (Bernardo and Miroslav).
   * Added support for SOAP based web services requests (Bernardo).
+  * Added support to use persistent HTTP(s) connection for speed
+    improvement, --keep-alive switch (Miroslav).
   * Added safe URL feature, --safe-url and --safe-freq (Miroslav).
   * Added --use-between switch to use BETWEEN syntax in inferencial
     statement and bypass firewalls filtering '>' character (Bernardo and
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index adcd0f896..9f5bb569b 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -49,6 +49,7 @@ optDict = {
                                "aType":             "string",
                                "aCred":             "string",
                                "aCert":             "string",
+                               "keepAlive":         "boolean",
                                "proxy":             "string",
                                "ignoreProxy":       "boolean",
                                "threads":           "integer",
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 08554e0b5..d5566a84d 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -113,6 +113,9 @@ def cmdLineParser():
                            help="HTTP authentication certificate ("
                                 "key_file,cert_file)")
 
+        request.add_option("--keep-alive", dest="keepAlive", action="store_true",
+                           help="Use persistent HTTP(s) connections")
+
         request.add_option("--proxy", dest="proxy",
                            help="Use a HTTP proxy to connect to the target url")
 
@@ -454,9 +457,6 @@ def cmdLineParser():
         parser.add_option("--common-prediction", dest="useCommonPrediction", action="store_true",
                           help=SUPPRESS_HELP)
 
-        parser.add_option("--keep-alive", dest="keepAlive", action="store_true",
-                          help=SUPPRESS_HELP)
-
         parser.add_option_group(target)
         parser.add_option_group(request)
         parser.add_option_group(injection)
diff --git a/sqlmap.conf b/sqlmap.conf
index dc7df9794..24d8f8e77 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -85,6 +85,9 @@ aCred =
 # Syntax: key_file,cert_file
 aCert = 
 
+# Use persistent HTTP(s) connections
+keepAlive = False
+
 # Use a HTTP proxy to connect to the target url.
 # Syntax: http://address:port
 proxy =