Merge branch 'master' of github.com:banago/PHPloy

banago · Mar 1, 2014 · d5036b8 · d5036b8
2 parents 9bdd454 + 8edf9f7
commit d5036b8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/phploy b/phploy
@@ -391,7 +391,13 @@ class PHPloy
                 throw new Exception("Oh Snap: Could not login to {$server['host']} (Tried to login as {$server['user']}).\n");
             }
 
-            ftp_pasv($connection, true);
+            $passive = true;
+            if (isset($server['passive']) and (bool) $server['passive'] == false)
+            {
+                $passive = false;
+            }
+
+            ftp_pasv($connection, $passive);
 
             if (ftp_chdir($connection, $server['path'])) {
                 $this->connection = $connection;