Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv19715
Modified Files:
NNTP.pm
Log Message:
restore POP3-style server[:port][:username] syntax
Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NNTP.pm 19 Mar 2003 04:03:31 -0000 1.6
--- NNTP.pm 19 Mar 2003 04:17:12 -0000 1.7
***************
*** 65,69 ****
# The separator within the NNTP user name is :
! $self->config_( 'separator', '@');
return 1;
--- 65,69 ----
# The separator within the NNTP user name is :
! $self->config_( 'separator', ':');
return 1;
***************
*** 122,131 ****
if ($connection_state eq 'username needed') {
! my $user_command = '^ *AUTHINFO USER ((.+)\\' . $self->config_('separator') . ')?([^\:]+)(:(.*))?';
! if ( $command =~ /$user_command/i ) {
! my $username = $2;
! my $server = $3;
! my $port = $5;
if ( $server ne '' ) {
--- 122,136 ----
if ($connection_state eq 'username needed') {
!
! # NOTE: This syntax is ambiguous if the NNTP username is a short (under 5 digit) string (eg, 32123).
! # If this is the case, run "perl popfile.pl -nntp_separator /" and change your kludged username
! # appropriately (syntax would then be server[:port][/username])
! my $user_command = '^ *AUTHINFO USER ([^:]+)(:([\d]{1,5}))?(\\' . $self->config_( 'separator' ) . '(.+))?';
! if ( $command =~ /$user_command/i ) {
! my $server = $1;
! # hey, the port has to be in range at least
! my $port = $3 if ( defined($3) && ($3 > 0) && ($3 < 65536) );
! my $username = $5;
if ( $server ne '' ) {
***************
*** 133,137 ****
if (defined $username) {
! # Pass through the AUTHINFO command with the actual user name for this server,
# if one is defined, and send the reply straight to the client
--- 138,142 ----
if (defined $username) {
! # Pass through the AUTHINFO command with the actual user name for this server,
# if one is defined, and send the reply straight to the client
|
