[Scoop-checkins] scoop/lib Scoop.pm

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/lib
In directory lithium.sabren.com:/tmp/cvs-serv22354/lib

Modified Files:
	Scoop.pm 
Log Message:
Committing hillct's remote ip patch.

-j



Index: Scoop.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop.pm,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** Scoop.pm	25 Jan 2005 17:15:23 -0000	1.141
--- Scoop.pm	14 May 2005 16:47:47 -0000	1.142
***************
*** 923,929 ****
      # comes from our proxy at localhost
      return $self->apache->connection->remote_ip() 
! 		unless (($self->apache->connection->remote_ip() eq "127.0.0.1")	and 
! 			 ($self->apache->headers_in->{'X-Forwarded-For'}));
! 	
  	
  	# Select last value in the chain -- original client's ip
--- 923,927 ----
      # comes from our proxy at localhost
      return $self->apache->connection->remote_ip() 
! 		unless ($self->apache->headers_in->{'X-Forwarded-For'});
  	
  	# Select last value in the chain -- original client's ip
***************
*** 931,937 ****
  		return $ip;
  	}	
- 
  	warn "  (Scoop::_get_remote_ip) done.\n" if ($DEBUG);
- 	
  	# If that failed. Eek! Return whatever we have.
  	return $self->apache->connection->remote_ip()
--- 929,933 ----