[mirrorbrain-commits] r8070 - /trunk/tools/scanner.pl

Author: poeml
Date: Fri Jul  2 14:03:11 2010
New Revision: 8070

URL: http://svn.mirrorbrain.org/viewvc/mirrorbrain?rev=8070&view=rev
Log:
- Usage of FTP authentication was fixed (with credentials encoded into the
  URL). The change done in January
  http://svn.mirrorbrain.org/viewvc/mirrorbrain/trunk/tools/scanner.pl?r1=7911&r2=7945
  was incomplete in so far that the FTP client used a wrong path now when
  cd'ing into a directory (complete URL instead of only the path component).
  This may have worked with some FTP servers, but it definitely didn't work
  with vsftpd. Thanks to Deepak Gupta for raising this issue and providing
  means to analyse it.

Modified:
    trunk/tools/scanner.pl

Modified: trunk/tools/scanner.pl
URL: http://svn.mirrorbrain.org/viewvc/mirrorbrain/trunk/tools/scanner.pl?rev=8070&r1=8069&r2=8070&view=diff
==============================================================================
--- trunk/tools/scanner.pl (original)
+++ trunk/tools/scanner.pl Fri Jul  2 14:03:11 2010
_at_@ -1226,7 +1226,7 @@
 sub ftp_cont
 {
   my ($ftp, $path) = _at__;
-  $path =~ s{^\w+://[^/:]+(:\d+)?/}{/};	# no proto host port prefix, please.
+  $path =~ s{^\w+://([^_at_]+@)?[^/:]+(:\d+)?/}{/};	# no proto/auth/host/port/prefix, please.
   $ftp->cwd($path) or return "550 failed: ftp-cwd($path): $! $_at_";
 
   $ftp->dir();




_______________________________________________
mirrorbrain-commits mailing list
Archive: http://mirrorbrain.org/archive/mirrorbrain-commits/

Note: To remove yourself from this list, send a mail with the content
 	unsubscribe
to the address mirrorbrain-commits-request_at_mirrorbrain.org