From: Lior Kaplan <kaplanlior@gmail.com>
Date: Tue, 15 Dec 2015 11:26:53 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~633
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10a5749f3eac0c999fc3a199fe7c96c151adc358;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Implement FR #55651 (Option to ignore the returned FTP PASV address)
---

10a5749f3eac0c999fc3a199fe7c96c151adc358