Odoo Addons (MOVED TO GITHUB)

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

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

Description of the change

Fix for bug lp:627670. Treat ftp_server_passive_ports as a range.

To post a comment you must log in.

Unmerged revisions

2780. By Don Kirkby

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'document/ftpserver/__init__.py'
--- document/ftpserver/__init__.py 2010-04-13 21:50:03 +0000
+++ document/ftpserver/__init__.py 2010-08-31 21:11:42 +0000
@@ -34,7 +34,7 @@
34PASSIVE_PORTS = None34PASSIVE_PORTS = None
35pps = config.get('ftp_server_passive_ports', '').split(':')35pps = config.get('ftp_server_passive_ports', '').split(':')
36if len(pps) == 2:36if len(pps) == 2:
37 PASSIVE_PORTS = int(pps[0]), int(pps[1])37 PASSIVE_PORTS = range(int(pps[0]), int(pps[1]) + 1)
3838
39class ftp_server(threading.Thread):39class ftp_server(threading.Thread):
40 def log(self, level, message):40 def log(self, level, message):