From: Steve Peters <steve@fisharerojo.org>
Date: Fri, 9 Dec 2005 01:41:44 +0000 (+0000)
Subject: Upgrade to CGI.pm-3.15
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=edc474076dfc565204d5ccc465db55bff0f2e1c4;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to CGI.pm-3.15

p4raw-id: //depot/perl@26308
---

diff --git a/lib/CGI.pm b/lib/CGI.pm
index bd3488e..4d5742b 100644
--- a/lib/CGI.pm
+++ b/lib/CGI.pm
@@ -19,7 +19,7 @@ use Carp 'croak';
 #   http://stein.cshl.org/WWW/software/CGI/
 
 $CGI::revision = '$Id: CGI.pm,v 1.194 2005/12/06 22:12:56 lstein Exp $';
-$CGI::VERSION='3.14_01';
+$CGI::VERSION='3.15_01';
 
 # HARD-CODED LOCATION FOR FILE UPLOAD TEMPORARY FILES.
 # UNCOMMENT THIS ONLY IF YOU KNOW WHAT YOU'RE DOING.
@@ -2631,8 +2631,8 @@ sub url {
     undef $path if $rewrite_in_use && $rewrite;  # path not valid when rewriting active
 
     my $uri         =  $rewrite && $request_uri ? $request_uri : $script_name;
-    $uri            =~ s/\?.+$//         if defined $query_str;
-    $uri            =~ s/$path$//        if defined $path;          # remove path from URI
+    $uri            =~ s/\?.*$//;                                 # remove query string
+    $uri            =~ s/$path$//      if defined $path;          # remove path
 
     if ($full) {
 	my $protocol = $self->protocol();
diff --git a/lib/CGI/Changes b/lib/CGI/Changes
index 8c0c42c..c451d7f 100644
--- a/lib/CGI/Changes
+++ b/lib/CGI/Changes
@@ -1,3 +1,6 @@
+  Version 3.15 Wed Dec  7 15:13:22 EST 2005
+   1. Remove extraneous "?" from self_url() when URI contains a ? but no query string.
+
   Version 3.14 Tue Dec  6 17:12:03 EST 2005
    1. Fixed broken scrolling_list() select attribute.