link-checker commit: Deprecate the -y/--proxy option in favour of the http_proxy env variable.

changeset:   108:ff138592745a
user:        ville
date:        Sun Nov 07 11:17:55 2004 +0000
files:       bin/checklink bin/checklink.pod docs/checklink.html
description:
Deprecate the -y/--proxy option in favour of the http_proxy env variable.


diff -r 181c252eceaa -r ff138592745a bin/checklink
--- a/bin/checklink	Sun Nov 07 10:23:44 2004 +0000
+++ b/bin/checklink	Sun Nov 07 11:17:55 2004 +0000
@@ -5,7 +5,7 @@
 # (c) 1999-2004 World Wide Web Consortium
 # based on Renaud Bruyeron's checklink.pl
 #
-# $Id: checklink,v 4.11 2004-11-07 10:23:44 ville Exp $
+# $Id: checklink,v 4.12 2004-11-07 11:17:55 ville Exp $
 #
 # This program is licensed under the W3C(r) Software License:
 #       http://www.w3.org/Consortium/Legal/copyright-software
@@ -110,7 +110,7 @@
   $PROGRAM     = 'W3C-checklink';
   $VERSION     = '4.0';
   $REVISION    = sprintf('version %s (c) 1999-2004 W3C', $VERSION);
-  my ($cvsver) = q$Revision: 4.11 $ =~ /(\d+[\d\.]*\.\d+)/;
+  my ($cvsver) = q$Revision: 4.12 $ =~ /(\d+[\d\.]*\.\d+)/;
   $AGENT       = sprintf('%s/%s [%s] %s',
                          $PROGRAM, $VERSION, $cvsver, LWP::RobotUA->_agent());
 
@@ -430,16 +430,23 @@
              't|timeout=i'     => \$Opts{Timeout},
              'S|sleep=i'       => \$Opts{Sleep_Time},
              'L|languages=s'   => \$Opts{Accept_Language},
-             'n|noacclanguage' => sub { warn("*** Warning: The " .
-                                        "-n/--noacclanguage option is " .
-                                        "deprecated and has no effect.\n"); },
              'D|depth=i'       => sub { $Opts{Depth} = $_[1]
                                           unless $_[1] == 0; },
              'd|domain=s'      => \$Opts{Trusted},
-             'y|proxy=s'       => \$Opts{HTTP_Proxy},
              'masquerade=s'    => \$masq,
              'hide-same-realm' => \$Opts{Hide_Same_Realm},
              'V|version'       => \&version,
+             # Deprecated options:
+             'n|noacclanguage' => sub { warn("*** Warning: The " .
+                                        "-n/--noacclanguage option is " .
+                                        "deprecated and has no effect.\n");
+                                      },
+             'y|proxy=s'       => sub { warn("*** Warning: The -y/--proxy " .
+                                        "option is deprecated, use the " .
+                                        "http_proxy\n             " .
+                                        "environment variable instead.\n");
+                                        $Opts{HTTP_Proxy} = $_[1];
+                                      },
             )
     || usage(1);
 
@@ -517,12 +524,12 @@
                             (default: $trust).
  --masquerade \"BASE1 BASE2\" Masquerade base URI BASE1 as BASE2.  See the
                             manual page for more information.
- -y, --proxy PROXY          Specify an HTTP proxy server.
  -H, --html                 HTML output.
  -?, -h, --help             Show this message and exit.
  -V, --version              Output version information and exit.
 
-See \"perldoc Net::FTP\" for information about various environment variables
+See \"perldoc LWP\" for information about proxy server support,
+\"perldoc Net::FTP\" for information about various environment variables
 affecting FTP connections and \"perldoc Net::NNTP\" for setting a default
 NNTP server for news: URIs.
 
diff -r 181c252eceaa -r ff138592745a bin/checklink.pod
--- a/bin/checklink.pod	Sun Nov 07 10:23:44 2004 +0000
+++ b/bin/checklink.pod	Sun Nov 07 11:17:55 2004 +0000
@@ -1,4 +1,4 @@
-$Id: checklink.pod,v 1.12 2004-06-08 21:45:58 ville Exp $
+$Id: checklink.pod,v 1.13 2004-11-07 11:17:55 ville Exp $
 
 =head1 NAME
 
@@ -128,10 +128,6 @@
 argument consisting of two URIs, separated by whitespace.  One usual way of
 providing a value with embedded whitespace is to enclose it in quotes.
 
-=item B<-y, --proxy> I<proxy>
-
-Specify an HTTP proxy server.
-
 =item B<-H, --html>
 
 HTML output.
diff -r 181c252eceaa -r ff138592745a docs/checklink.html
--- a/docs/checklink.html	Sun Nov 07 10:23:44 2004 +0000
+++ b/docs/checklink.html	Sun Nov 07 11:17:55 2004 +0000
@@ -6,7 +6,7 @@
     <title>W3C Link Checker Documentation</title>
     <link rev="made" href="mailto:www-validator@w3.org" />
     <style type="text/css" media="all">@import "linkchecker.css";</style>
-    <meta name="revision" content="$Id: checklink.html,v 1.24 2004-11-06 11:39:28 ville Exp $" />
+    <meta name="revision" content="$Id: checklink.html,v 1.25 2004-11-07 11:17:55 ville Exp $" />
   </head>
 
   <body>
@@ -179,6 +179,13 @@
     </p>
 
     <p>
+      The link checker honors proxy settings from the
+      <code><em>scheme</em>_proxy</code> environment variables.  See
+      <a href="http://search.cpan.org/dist/libwww-perl/lib/LWP.pm#ENVIRONMENT">LWP(3)</a>
+      for more information.
+    </p>
+
+    <p>
       Some environment variables affect the way how the link checker uses
       <a href="http://www.ietf.org/rfc/rfc959.txt"><abbr title="File Transfer Protocol">FTP</abbr></a>.
       In particular, passive mode is the default.  See
@@ -253,7 +260,7 @@
         alt="Valid XHTML 1.0!" /></a>
       <a title="Send Feedback for the W3C Link Checker"
         href="http://validator.w3.org/feedback.html">The W3C Validator Team</a><br />
-      $Date: 2004-11-06 11:39:28 $
+      $Date: 2004-11-07 11:17:55 $
     </address>
     <p class="copyright">
       <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2004

Received on Thursday, 5 August 2010 14:47:14 UTC