@@ -206,6 +206,7 @@ class Config(object):

     # s3 will timeout if a request/transfer is stuck for more than a short time

     throttle_max = 100

     public_url_use_https = False

+    connection_pooling = True

     ## Creating a singleton

     def __new__(self, configfile = None, access_key=None, secret_key=None, access_token=None):

@@ -257,16 +257,27 @@ class ConnMan(object):

     @staticmethod

     def put(conn):

         if conn.id.startswith("proxy://"):

-            conn.c.close()

+            ConnMan.close(conn)

             debug("ConnMan.put(): closing proxy connection (keep-alive not yet supported)")

             return

         if conn.counter >= ConnMan.conn_max_counter:

-            conn.c.close()

+            ConnMan.close(conn)

             debug("ConnMan.put(): closing over-used connection")

             return

+        cfg = Config()

+        if not cfg.connection_pooling:

+            ConnMan.close(conn)

+            debug("ConnMan.put(): closing connection (connection pooling disabled)")

+            return

+

         ConnMan.conn_pool_sem.acquire()

         ConnMan.conn_pool[conn.id].append(conn)

         ConnMan.conn_pool_sem.release()

         debug("ConnMan.put(): connection put back to pool (%s#%d)" % (conn.id, conn.counter))

+

+    @staticmethod

+    def close(conn):

+        if conn:

+            conn.c.close()

@@ -1307,10 +1307,9 @@ class S3(object):

             # When the connection is broken, BadStatusLine is raised with py2

             # and RemoteDisconnected is raised by py3 with a trap:

             # RemoteDisconnected has an errno field with a None value.

-            if conn:

-                # close the connection and re-establish

-                conn.counter = ConnMan.conn_max_counter

-                ConnMan.put(conn)

+

+            # close the connection and re-establish

+            ConnMan.close(conn)

             if retries:

                 warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

                 warning("Waiting %d sec..." % self._fail_wait(retries))

@@ -1664,10 +1663,9 @@ class S3(object):

                 or "[Errno 104]" in str(e) or "[Errno 32]" in str(e)

                ) and not isinstance(e, SocketTimeoutException):

                 raise

-            if conn:

-                # close the connection and re-establish

-                conn.counter = ConnMan.conn_max_counter

-                ConnMan.put(conn)

+

+            # close the connection and re-establish

+            ConnMan.close(conn)

             if retries:

                 warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

@@ -1761,8 +1759,7 @@ class S3(object):

                ) and not isinstance(e, SocketTimeoutException):

                 raise

             # close the connection and re-establish

-            conn.counter = ConnMan.conn_max_counter

-            ConnMan.put(conn)

+            ConnMan.close(conn)

             if retries:

                 warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

@@ -2760,6 +2760,7 @@ def main():

     optparser.add_option(      "--no-check-hostname", dest="check_ssl_hostname", action="store_false", help="Do not check SSL certificate hostname validity")

     optparser.add_option(      "--signature-v2", dest="signature_v2", action="store_true", help="Use AWS Signature version 2 instead of newer signature methods. Helpful for S3-like systems that don't have AWS Signature v4 yet.")

     optparser.add_option(      "--limit-rate", dest="limitrate", action="store", type="string", help="Limit the upload or download speed to amount bytes per second.  Amount may be expressed in bytes, kilobytes with the k suffix, or megabytes with the m suffix")

+    optparser.add_option(      "--no-connection-pooling", dest="connection_pooling", action="store_false", help="Disable connection re-use")

     optparser.add_option(      "--requester-pays", dest="requester_pays", action="store_true", help="Set the REQUESTER PAYS flag for operations")

     optparser.add_option("-l", "--long-listing", dest="long_listing", action="store_true", help="Produce long listing [ls]")

     optparser.add_option(      "--stop-on-error", dest="stop_on_error", action="store_true", help="stop if error in transfer")