Odoo Addons (MOVED TO GITHUB)

Merge lp:~zaber/openobject-addons/document-ftp-ports-6.1 into lp:openobject-addons/6.1

  1. document-ftp-ports-6.1
  2. Merge into 6.1
Proposed by Don Kirkby
Status: Needs review
Proposed branch: lp:~zaber/openobject-addons/document-ftp-ports-6.1
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
document_ftp/ftpserver/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~zaber/openobject-addons/document-ftp-ports-6.1
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+115825@code.launchpad.net

Description of the change

Treat the FTP passive ports configuration setting as a range, not two separate ports.

To post a comment you must log in.

Unmerged revisions

6897. By Don Kirkby

[FIX] Treat FTP server passive port as a range.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'document_ftp/ftpserver/__init__.py'
--- document_ftp/ftpserver/__init__.py 2011-10-11 20:05:49 +0000
+++ document_ftp/ftpserver/__init__.py 2012-07-19 20:12:19 +0000
@@ -32,7 +32,7 @@
32 PASSIVE_PORTS = None32 PASSIVE_PORTS = None
33 pps = config.get('ftp_server_passive_ports', '').split(':')33 pps = config.get('ftp_server_passive_ports', '').split(':')
34 if len(pps) == 2:34 if len(pps) == 2:
35 PASSIVE_PORTS = int(pps[0]), int(pps[1])35 PASSIVE_PORTS = range(int(pps[0]), int(pps[1]) + 1)
3636
37 class ftp_server(threading.Thread):37 class ftp_server(threading.Thread):
38 def log(self, level, message):38 def log(self, level, message):