Merge lp:~cjwatson/txpkgupload/ipv4-mapped-pasv into lp:~lazr-developers/txpkgupload/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 46 | ||||
Proposed branch: | lp:~cjwatson/txpkgupload/ipv4-mapped-pasv | ||||
Merge into: | lp:~lazr-developers/txpkgupload/trunk | ||||
Diff against target: |
95 lines (+47/-2) 3 files modified
requirements.txt (+1/-1) setup.py (+1/-0) src/txpkgupload/twistedftp.py (+45/-1) |
||||
To merge this branch: | bzr merge lp:~cjwatson/txpkgupload/ipv4-mapped-pasv | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+369996@code.launchpad.net |
Commit message
Fix behaviour of PASV with IPv4-mapped addresses.
Description of the change
When receiving a connection to an IPv6 endpoint using an IPv4-mapped address (possible on some IPv6 stacks), PASV can work but needs to return a properly-encoded IPv4 address. Including the leading "::ffff:" in the response appears to confuse connection tracking in some firewalls.
This is a backport from a commit in https:/