# HG changeset patch
# User jwe
# Date 1192131542 0
# Node ID f943e9635115a29cc4e00a8c6f6a472d67eeef62
# Parent  fa4b43705e3719fddad9a2d2a0a8faca984dc500
[project @ 2007-10-11 19:39:02 by jwe]

diff -r fa4b43705e37 -r f943e9635115 src/ChangeLog
--- a/src/ChangeLog	Thu Oct 11 18:15:53 2007 +0000
+++ b/src/ChangeLog	Thu Oct 11 19:39:02 2007 +0000
@@ -1,3 +1,7 @@
+2007-10-11  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/urlwrite.cc (urlget): Disable use of EPSV mode.
+
 2007-10-11  Brian Gough  <bjg@network-theory.co.uk>
 
 	* DLD-FUNCTIONS/fftn.cc, DLD-FUNCTIONS/regexp.cc, dirfns.cc,
diff -r fa4b43705e37 -r f943e9635115 src/DLD-FUNCTIONS/urlwrite.cc
--- a/src/DLD-FUNCTIONS/urlwrite.cc	Thu Oct 11 18:15:53 2007 +0000
+++ b/src/DLD-FUNCTIONS/urlwrite.cc	Thu Oct 11 19:39:02 2007 +0000
@@ -126,7 +126,7 @@
       curl_easy_setopt (curl, CURLOPT_POSTFIELDS, query_string.c_str ());
     }
   else
-    curl_easy_setopt (curl, CURLOPT_URL,url.c_str());
+    curl_easy_setopt (curl, CURLOPT_URL, url.c_str());
 
   // Define our callback to get called when there's data to be written.
   curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, write_data);
@@ -135,14 +135,19 @@
   curl_easy_setopt (curl, CURLOPT_WRITEDATA, static_cast<void*> (&stream));
 
   // Follow redirects.
-  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
+  curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, true);
+
+  // Don't use EPSV since connecting to sites that don't support it
+  // will hang for some time (3 minutes?) before moving on to try PASV
+  // instead.
+  curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, false);
 
   curl_easy_setopt (curl, CURLOPT_NOPROGRESS, true);
   curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, url.c_str ());
   curl_easy_setopt (curl, CURLOPT_FAILONERROR, true);
 
-  // Switch on full protocol/debug output
-  // curl_easy_setopt(curl, CURLOPT_VERBOSE, true);
+  // Switch on full protocol/debug output.
+  // curl_easy_setopt (curl, CURLOPT_VERBOSE, true);
 
   CURLcode res = CURLE_OK;
 
diff -r fa4b43705e37 -r f943e9635115 src/toplev.cc
--- a/src/toplev.cc	Thu Oct 11 18:15:53 2007 +0000
+++ b/src/toplev.cc	Thu Oct 11 19:39:02 2007 +0000
@@ -921,7 +921,7 @@
 	}
 
       bool unix_system = true;
-      bool macos_system = false;
+      bool mac_system = false;
       bool windows_system = false;
 
 #if defined (WIN32)