head	1.3;
access;
symbols
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.2
	RELEASE_4_10_0:1.2
	RELEASE_5_2_1:1.2
	RELEASE_5_2_0:1.2
	RELEASE_4_9_0:1.2
	RELEASE_5_1_0:1.2
	RELEASE_4_8_0:1.2
	RELEASE_5_0_0:1.2
	RELEASE_4_7_0:1.2
	RELEASE_4_6_2:1.2
	RELEASE_4_6_1:1.2
	RELEASE_4_6_0:1.2
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.1
	RELEASE_4_0_0:1.1
	RELEASE_3_4_0:1.1
	RELEASE_3_3_0:1.1
	RELEASE_3_2_0:1.1
	RELEASE_3_1_0:1.1
	RELEASE_2_2_8:1.1;
locks; strict;
comment	@# @;


1.3
date	2009.07.08.02.35.36;	author pgollucci;	state dead;
branches;
next	1.2;

1.2
date	2000.07.02.03.42.55;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	98.11.02.08.56.30;	author ache;	state Exp;
branches;
next	;


desc
@@


1.3
log
@- patch file shuffle for my sanity
@
text
@--- lib/URL.pl.orig	Fri Jan  9 08:58:41 1998
+++ lib/URL.pl	Sun Jul  2 07:39:30 2000
@@@@ -49,7 +49,10 @@@@
 	    $host =~ tr/A-Z/a-z/;
 	    $port = ($3 ne "" ? $3 : $ftp_port);
 	    $path = $4; 
-	    if ($userstring =~ /(.*):(.*)@@/) {
+	    if (!defined($userstring)) {
+		$userid = undef;
+		$passwd = undef;
+	    } elsif ($userstring =~ /(.*):(.*)@@/) {
 		$userid = $1;
 		$passwd = $2;
 	    } else {
@@@@ -102,7 +105,7 @@@@
 # URL of type: http://host[:port]/path[?search-string]
 
     if ($protocol eq "http") {
-	if ($url =~ m#^\s*\w+://([\w-\.]+):?(\d*)([^ \t]*)$#) {
+	if ($url =~ m#^\s*\w+://([\w\-\.]+):?(\d*)([^ \t]*)$#) {
 	    $server = $1;
 	    $server =~ tr/A-Z/a-z/;
 	    $port = ($2 ne "" ? $2 : $http_port);
@@@@ -137,7 +140,7 @@@@
 # URL of type: gopher://host[:port]/[gtype]selector-string[?search-string]
 
     if ($protocol eq "gopher") {
-	if ($url =~ m#^\s*\w+://([\w-\.]+):?(\d*)/?(\w?)([^ \t\?]*)\??(.*)$#) {
+	if ($url =~ m#^\s*\w+://([\w\-\.]+):?(\d*)/?(\w?)([^ \t\?]*)\??(.*)$#) {
 	    $server = $1;
 	    $server =~ tr/A-Z/a-z/;
 	    $port = ($2 ne "" ? $2 : $gopher_port);
@@@@ -152,7 +155,7 @@@@
 # URL of type: wais://host[:port]/database?search-string
 
     if ($protocol eq "wais") {
-	if ($url =~ m#^\s\w+://([\w-\.]+):?(\d*)/?([^\?]+)\??(.*)$#) {
+	if ($url =~ m#^\s\w+://([\w\-\.]+):?(\d*)/?([^\?]+)\??(.*)$#) {
 	    $1 =~ tr/A-Z/a-z/;
 	    $server = $1;
 	    $port = (defined($2) ? $2 : $wais_port);
@


1.2
log
@Fix wrong range in RE
@
text
@@


1.1
log
@fix warning for some undef variables
@
text
@d1 2
a2 2
--- lib/URL.pl.bak	Fri Jan  9 08:58:41 1998
+++ lib/URL.pl	Mon Nov  2 11:49:57 1998
d15 27
@

