diff -cNr CGI-modules-2.75.orig/CGI/Carp.pm CGI-modules-2.75/CGI/Carp.pm
*** CGI-modules-2.75.orig/CGI/Carp.pm	Thu Feb 15 02:54:02 1996
--- CGI-modules-2.75/CGI/Carp.pm	Mon Apr 29 23:52:56 1996
***************
*** 172,180 ****
--- 172,188 ----
      realdie $message;
  }
  
+ # Avoid generating "subroutine redefined" warnings with the following
+ # hack:
+ {
+     local $^W=0;
+     eval <<EOF;
  sub confess { CGI::Carp::die Carp::longmess @_; }
  sub croak { CGI::Carp::die Carp::shortmess @_; }
  sub carp { CGI::Carp::warn Carp::shortmess @_; }
+ EOF
+     ;
+ }
  
  # We have to be ready to accept a filehandle as a reference
  # or a string.
diff -cNr CGI-modules-2.75.orig/CGI.man CGI-modules-2.75/CGI.man
*** CGI-modules-2.75.orig/CGI.man	Tue Apr  2 23:55:34 1996
--- CGI-modules-2.75/CGI.man	Mon Apr 29 23:55:36 1996
***************
*** 73,79 ****
  .nr % 0
  .rr F
  .\}
! .TH CGI 1 "perl " "2/Apr/96" "User Contributed Perl Documentation"
  .IX Title "CGI 1"
  .UC
  .IX Name "CGI - Simple Common Gateway Interface Class"
--- 73,79 ----
  .nr % 0
  .rr F
  .\}
! .TH CGI 1 "perl " "24/Apr/96" "User Contributed Perl Documentation"
  .IX Title "CGI 1"
  .UC
  .IX Name "CGI - Simple Common Gateway Interface Class"
***************
*** 299,306 ****
  the \-override parameter accepted by all methods that generate
  form elements.)
  .PP
! \fIparam()\fR also recognizes the named parameter style of calling described
! below:
  .PP
  .Vb 1
  \&    $query->param(-name=>'foo',-values=>['an','array','of','values']);
--- 299,306 ----
  the \-override parameter accepted by all methods that generate
  form elements.)
  .PP
! \fIparam()\fR also recognizes a named parameter style of calling described
! in more detail later:
  .PP
  .Vb 1
  \&    $query->param(-name=>'foo',-values=>['an','array','of','values']);
***************
*** 349,356 ****
  .IX Subsection "\s-1CREATING\s0 A \s-1SELF\s0\-\s-1REFERENCING\s0 \s-1URL\s0 \s-1THAT\s0 \s-1PRESERVES\s0 \s-1STATE\s0 \s-1INFORMATION\s0:"
  .PP
  .Vb 2
! \&    $myself = $query->self_url
! \&    print "<A HREF=$myself>I'm talking to myself.</A>
  .Ve
  \fIself_url()\fR will return a \s-1URL\s0, that, when selected, will reinvoke
  this script with all its state information intact.  This is most
--- 349,356 ----
  .IX Subsection "\s-1CREATING\s0 A \s-1SELF\s0\-\s-1REFERENCING\s0 \s-1URL\s0 \s-1THAT\s0 \s-1PRESERVES\s0 \s-1STATE\s0 \s-1INFORMATION\s0:"
  .PP
  .Vb 2
! \&    $myself = $query->self_url;
! \&    print "<A HREF=$myself>I'm talking to myself.</A>";
  .Ve
  \fIself_url()\fR will return a \s-1URL\s0, that, when selected, will reinvoke
  this script with all its state information intact.  This is most
***************
*** 359,376 ****
  of the \fIform\fR\|(s).  Something like this will do the trick.
  .PP
  .Vb 4
! \&     $myself = $query->self_url
! \&     print "<A HREF=$myself#table1>See table 1</A>
! \&     print "<A HREF=$myself#table2>See table 2</A>
! \&     print "<A HREF=$myself#yourself>See for yourself</A>
  .Ve
  If you don't want to get the whole query string, call
  the method \fIurl()\fR to return just the \s-1URL\s0 for the script:
  .PP
  .Vb 2
! \&    $myself = $query->url
! \&    print "<A HREF=$myself>No query string in this baby!</A>
  .Ve
  .Sh "\s-1CALLING\s0 \s-1CGI\s0 \s-1FUNCTIONS\s0 \s-1THAT\s0 \s-1TAKE\s0 \s-1MULTIPLE\s0 \s-1ARGUMENTS\s0"
  .IX Subsection "\s-1CALLING\s0 \s-1CGI\s0 \s-1FUNCTIONS\s0 \s-1THAT\s0 \s-1TAKE\s0 \s-1MULTIPLE\s0 \s-1ARGUMENTS\s0"
  In versions of \s-1CGI\s0.pm prior to 2.0, it could get difficult to remember
--- 359,413 ----
  of the \fIform\fR\|(s).  Something like this will do the trick.
  .PP
  .Vb 4
! \&     $myself = $query->self_url;
! \&     print "<A HREF=$myself#table1>See table 1</A>";
! \&     print "<A HREF=$myself#table2>See table 2</A>";
! \&     print "<A HREF=$myself#yourself>See for yourself</A>";
  .Ve
  If you don't want to get the whole query string, call
  the method \fIurl()\fR to return just the \s-1URL\s0 for the script:
  .PP
  .Vb 2
! \&    $myself = $query->url;
! \&    print "<A HREF=$myself>No query string in this baby!</A>\en";
  .Ve
+ You can also retrieve the unprocessed query string with \fIquery_string()\fR:
+ .PP
+ .Vb 1
+ \&    $the_string = $query->query_string;
+ .Ve
+ .Sh "\s-1COMPATABILITY\s0 \s-1WITH\s0 \s-1CGI\s0\-\s-1LIB\s0.\s-1PL\s0"
+ .IX Subsection "\s-1COMPATABILITY\s0 \s-1WITH\s0 \s-1CGI\s0\-\s-1LIB\s0.\s-1PL\s0"
+ To make it easier to port existing programs that use cgi-lib.pl
+ the compatability routine \*(L"ReadParse\*(R" is provided.  Porting is
+ simple:
+ .PP
+ \s-1OLD\s0 \s-1VERSION\s0
+     require \*(L"cgi-lib.pl\*(R";
+     &ReadParse;
+     print \*(L"The value of the antique is \f(CW$in\fR{antique}.\en\*(R";
+ .PP
+ \s-1NEW\s0 \s-1VERSION\s0
+     use \s-1CGI\s0;
+     \s-1CGI::\s0ReadParse
+     print \*(L"The value of the antique is \f(CW$in\fR{antique}.\en\*(R";
+ .PP
+ \s-1CGI\s0.pm's \fIReadParse()\fR routine creates a tied variable named \f(CW%in\fR,
+ which can be accessed to obtain the query variables.  Like
+ ReadParse, you can also provide your own variable.  Infrequently
+ used features of ReadParse, such as the creation of \f(CW@in\fR and \f(CW$in\fR 
+ variables, are not supported.
+ .PP
+ Once you use ReadParse, you can retrieve the query object itself
+ this way:
+ .PP
+ .Vb 3
+ \&    $q = $in{CGI};
+ \&    print $q->textfield(-name=>'wow',
+ \&                        -value=>'does this really work?');
+ .Ve
+ This allows you to start using the more interesting features
+ of \s-1CGI\s0.pm without rewriting your old scripts from scratch.
  .Sh "\s-1CALLING\s0 \s-1CGI\s0 \s-1FUNCTIONS\s0 \s-1THAT\s0 \s-1TAKE\s0 \s-1MULTIPLE\s0 \s-1ARGUMENTS\s0"
  .IX Subsection "\s-1CALLING\s0 \s-1CGI\s0 \s-1FUNCTIONS\s0 \s-1THAT\s0 \s-1TAKE\s0 \s-1MULTIPLE\s0 \s-1ARGUMENTS\s0"
  In versions of \s-1CGI\s0.pm prior to 2.0, it could get difficult to remember
***************
*** 445,454 ****
  .Vb 1
  \&             -or-
  .Ve
! .Vb 4
  \&        print $query->header(-type=>'image/gif',
  \&                             -status=>'402 Payment required',
! \&                             -cookie=>&get_random_cookie(),
  \&                             -Cost=>'$2.00');
  .Ve
  \fIheader()\fR returns the Content-type: header.  You can provide your own
--- 482,492 ----
  .Vb 1
  \&             -or-
  .Ve
! .Vb 5
  \&        print $query->header(-type=>'image/gif',
  \&                             -status=>'402 Payment required',
! \&                             -expires=>'+3d',
! \&                             -cookie=>$cookie,
  \&                             -Cost=>'$2.00');
  .Ve
  \fIheader()\fR returns the Content-type: header.  You can provide your own
***************
*** 463,483 ****
  .Ve
  The last example shows the named argument style for passing arguments
  to the \s-1CGI\s0 methods using named parameters.  Recognized parameters are
! \fB\-type\fR, \fB\-status\fR, and \fB\-cookie\fR.  Any other parameters will 
! be stripped of their initial hyphens and turned into header fields.
  .PP
! The cookie parameter generates a header that tells the browser to provide
  a \*(L"magic cookie\*(R" during all subsequent transactions with your script.
! The value of the cookie can be almost anything you like (I doubt that
! newlines will work though), and can be used as a unique session \s-1ID\s0
! or even to store a small number of state variables.  You can retrieve
! the value of the browser's magic cookie with the \fIcookie()\fR method.
  .PP
  As of version 1.56, all \s-1HTTP\s0 headers produced by \s-1CGI\s0.pm contain the
  Pragma: no-cache instruction.  However, as of version 1.57, this is
! turned \s-1OFF\s0 by default because it causes Netscape 2.0 beta to produce
! an annoying warning message every time the \*(L"back\*(R" button is hit.  Turn
! it on again with the method \fIcache()\fR.
  .Sh "\s-1GENERATING\s0 A \s-1REDIRECTION\s0 \s-1INSTRUCTION\s0"
  .IX Subsection "\s-1GENERATING\s0 A \s-1REDIRECTION\s0 \s-1INSTRUCTION\s0"
  .PP
--- 501,543 ----
  .Ve
  The last example shows the named argument style for passing arguments
  to the \s-1CGI\s0 methods using named parameters.  Recognized parameters are
! \fB\-type\fR, \fB\-status\fR, \fB\-expires\fR, and \fB\-cookie\fR.  Any other 
! parameters will be stripped of their initial hyphens and turned into
! header fields, allowing you to specify any \s-1HTTP\s0 header you desire.
! .PP
! Most browsers will not cache the output from \s-1CGI\s0 scripts.  Every time
! the browser reloads the page, the script is invoked anew.  You can
! change this behavior with the \fB\-expires\fR parameter.  When you specify
! an absolute or relative expiration interval with this parameter, some
! browsers and proxy servers will cache the script's output until the
! indicated expiration date.  The following forms are all valid for the
! \-expires field:
! .PP
! .Vb 8
! \&        +30s                              30 seconds from now
! \&        +10m                              ten minutes from now
! \&        +1h                               one hour from now
! \&        -1d                               yesterday (i.e. "ASAP!")
! \&        now                               immediately
! \&        +3M                               in three months
! \&        +10y                              in ten years time
! \&        Thursday, 25-Apr-96 00:40:33 GMT  at the indicated time & date
! .Ve
! (\fI\s-1CGI::\s0expires()\fR is the static function call used internally that turns
! relative time intervals into \s-1HTTP\s0 dates.  You can call it directly if
! you wish.)
  .PP
! The \fB\-cookie\fR parameter generates a header that tells the browser to provide
  a \*(L"magic cookie\*(R" during all subsequent transactions with your script.
! Netscape cookies have a special format that includes interesting attributes
! such as expiration time.  Use the \fIcookie()\fR method to create and retrieve
! session cookies.
  .PP
  As of version 1.56, all \s-1HTTP\s0 headers produced by \s-1CGI\s0.pm contain the
  Pragma: no-cache instruction.  However, as of version 1.57, this is
! turned \s-1OFF\s0 by default because it causes Netscape 2.0 and higher to
! produce an annoying warning message every time the \*(L"back\*(R" button is
! hit.  Turn it on again with the method \fIcache()\fR.
  .Sh "\s-1GENERATING\s0 A \s-1REDIRECTION\s0 \s-1INSTRUCTION\s0"
  .IX Subsection "\s-1GENERATING\s0 A \s-1REDIRECTION\s0 \s-1INSTRUCTION\s0"
  .PP
***************
*** 1414,1419 ****
--- 1474,1609 ----
  pointed to by the \fB\-onClick\fR parameter will be executed.  On
  non-Netscape browsers this form element will probably not even
  display.
+ .SH "NETSCAPE COOKIES"
+ .IX Header "NETSCAPE COOKIES"
+ Netscape browsers versions 1.1 and higher support a so-called
+ \*(L"cookie\*(R" designed to help maintain state within a browser session.
+ CGI.pm has several methods that support cookies.
+ .PP
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+ them to the browser in the HTTP header.  The browser maintains a list
+ of cookies that belong to a particular Web server, and returns them
+ to the CGI script during subsequent interactions.
+ .PP
+ In addition to the required name=value pair, each cookie has several
+ optional attributes:
+ .Ip "1. an expiration time" 4
+ .IX Item "1. an expiration time"
+ This is a time/date string (in a special \s-1GMT\s0 format) that indicates
+ when a cookie expires.  The cookie will be saved and returned to your
+ script until this expiration date is reached if the user exits
+ Netscape and restarts it.  If an expiration date isn't specified, the cookie
+ will remain active until the user quits Netscape.
+ .Ip "2. a domain" 4
+ .IX Item "2. a domain"
+ This is a partial or complete domain name for which the cookie is 
+ valid.  The browser will return the cookie to any host that matches
+ the partial domain name.  For example, if you specify a domain name
+ of \*(L".capricorn.com\*(R", then Netscape will return the cookie to
+ Web servers running on any of the machines \*(L"www.capricorn.com\*(R", 
+ \*(L"www2.capricorn.com\*(R", \*(L"feckless.capricorn.com\*(R", etc.  Domain names
+ must contain at least two periods to prevent attempts to match
+ on top level domains like \*(L".edu\*(R".  If no domain is specified, then
+ the browser will only return the cookie to servers on the host the
+ cookie originated from.
+ .Ip "3. a path" 4
+ .IX Item "3. a path"
+ If you provide a cookie path attribute, the browser will check it
+ against your script's \s-1URL\s0 before returning the cookie.  For example,
+ if you specify the path \*(L"/cgi-bin\*(R", then the cookie will be returned
+ to each of the scripts \*(L"/cgi-bin/tally.pl\*(R", \*(L"/cgi-bin/order.pl\*(R",
+ and \*(L"/cgi-bin/customer_service/complain.pl\*(R", but not to the script
+ \*(L"/cgi-private/site_admin.pl\*(R".  By default, path is set to \*(L"/\*(R", which
+ causes the cookie to be sent to any \s-1CGI\s0 script on your site.
+ .Ip "4. a \*(L"secure\*(R" flag" 4
+ .IX Item "4. a \*(L"secure\*(R" flag"
+ If the \*(L"secure\*(R" attribute is set, the cookie will only be sent to your
+ script if the \s-1CGI\s0 request is occurring on a secure channel, such as \s-1SSL\s0.
+ .PP
+ The interface to Netscape cookies is the \fBcookie()\fR method:
+ .PP
+ .Vb 7
+ \&    $cookie = $query->cookie(-name=>'sessionID',
+ \&                             -value=>'xyzzy',
+ \&                             -expires=>'+1h',
+ \&                             -path=>'/cgi-bin/database',
+ \&                             -domain=>'.capricorn.org',
+ \&                             -secure=>1);
+ \&    print $query->header(-cookie=>$cookie);
+ .Ve
+ \fBcookie()\fR creates a new cookie.  Its parameters include:
+ .Ip "\fB\-name\fR" 4
+ .IX Item "\fB\-name\fR"
+ The name of the cookie (required).  This can be any string at all.
+ Although Netscape limits its cookie names to non-whitespace
+ alphanumeric characters, \s-1CGI\s0.pm removes this restriction by escaping
+ and unescaping cookies behind the scenes.
+ .Ip "\fB\-value\fR" 4
+ .IX Item "\fB\-value\fR"
+ The value of the cookie.  This can be any scalar value,
+ array reference, or even associative array reference.  For example,
+ you can store an entire associative array into a cookie this way:
+ .Sp
+ .Vb 2
+ \&        $cookie=$query->cookie(-name=>'family information',
+ \&                               -value=>\e%childrens_ages);
+ .Ve
+ .Ip "\fB\-path\fR" 4
+ .IX Item "\fB\-path\fR"
+ The optional partial path for which this cookie will be valid, as described
+ above.
+ .Ip "\fB\-domain\fR" 4
+ .IX Item "\fB\-domain\fR"
+ The optional partial domain for which this cookie will be valid, as described
+ above.
+ .Ip "\fB\-expires\fR" 4
+ .IX Item "\fB\-expires\fR"
+ The optional expiration date for this cookie.  The format is as described 
+ in the section on the \fBheader()\fR method:
+ .Sp
+ .Vb 1
+ \&        "+1h"  one hour from now
+ .Ve
+ .Ip "\fB\-secure\fR" 4
+ .IX Item "\fB\-secure\fR"
+ If set to true, this cookie will only be used within a secure
+ \s-1SSL\s0 session.
+ .PP
+ The cookie created by \fIcookie()\fR must be incorporated into the \s-1HTTP\s0
+ header within the string returned by the \fIheader()\fR method:
+ .PP
+ .Vb 1
+ \&        print $query->header(-cookie=>$my_cookie);
+ .Ve
+ To create multiple cookies, give \fIheader()\fR an array reference:
+ .PP
+ .Vb 5
+ \&        $cookie1 = $query->cookie(-name=>'riddle_name',
+ \&                                  -value=>"The Sphynx's Question");
+ \&        $cookie2 = $query->cookie(-name=>'answers',
+ \&                                  -value=>\e%answers);
+ \&        print $query->header(-cookie=>[$cookie1,$cookie2]);
+ .Ve
+ To retrieve a cookie, request it by name by calling \fIcookie()\fR
+ method without the \fB\-value\fR parameter:
+ .PP
+ .Vb 4
+ \&        use CGI;
+ \&        $query = new CGI;
+ \&        %answers = $query->cookie(-name=>'answers');
+ \&        # $query->cookie('answers') will work too!
+ .Ve
+ See the \fBcookie.cgi\fR example script for some ideas on how to use
+ cookies effectively.
+ .PP
+ \fB\s-1NOTE\s0:\fR There appear to be some (undocumented) restrictions on
+ Netscape cookies.  In Netscape 2.01, at least, I haven't been able to
+ set more than three cookies at a time.  There may also be limits on
+ the length of cookies.  If you need to store a lot of information,
+ it's probably better to create a unique session \s-1ID\s0, store it in a
+ cookie, and use the session \s-1ID\s0 to locate an external file/database
+ saved on the server's side of the connection.
  .SH "WORKING WITH NETSCAPE FRAMES"
  .IX Header "WORKING WITH NETSCAPE FRAMES"
  It's possible for CGI.pm scripts to write into several browser
***************
*** 1456,1462 ****
  When your script is reinvoked by the form, its output will be loaded
  into the frame named \*(L"ResultsWindow\*(R".  If one doesn't already exist
  a new window will be created.
! .Sp
  The script \*(L"frameset.cgi\*(R" in the examples directory shows one way to
  create pages in which the fill-out form and the response live in
  side-by-side frames.
--- 1646,1652 ----
  When your script is reinvoked by the form, its output will be loaded
  into the frame named \*(L"ResultsWindow\*(R".  If one doesn't already exist
  a new window will be created.
! .PP
  The script \*(L"frameset.cgi\*(R" in the examples directory shows one way to
  create pages in which the fill-out form and the response live in
  side-by-side frames.
***************
*** 1468,1499 ****
  from standard input (you don't have to worry about tricking your
  script into reading from environment variables).
  You can pass keywords like this:
! .Sp
  .Vb 1
  \&    your_script.pl keyword1 keyword2 keyword3
  .Ve
  or this:
! .Sp
  .Vb 1
  \&   your_script.pl keyword1+keyword2+keyword3
  .Ve
  or this:
! .Sp
  .Vb 1
  \&    your_script.pl name1=value1 name2=value2
  .Ve
  or this:
! .Sp
  .Vb 1
  \&    your_script.pl name1=value1&name2=value2
  .Ve
  or even as newline-delimited parameters on standard input.
! .Sp
  When debugging, you can use quotes and backslashes to escape 
  characters in the familiar shell manner, letting you place
  spaces and other funny characters in your parameter=value
  pairs:
! .Sp
  .Vb 1
  \&   your_script.pl "name1='I am a long value'" "name2=two\e words"
  .Ve
--- 1658,1689 ----
  from standard input (you don't have to worry about tricking your
  script into reading from environment variables).
  You can pass keywords like this:
! .PP
  .Vb 1
  \&    your_script.pl keyword1 keyword2 keyword3
  .Ve
  or this:
! .PP
  .Vb 1
  \&   your_script.pl keyword1+keyword2+keyword3
  .Ve
  or this:
! .PP
  .Vb 1
  \&    your_script.pl name1=value1 name2=value2
  .Ve
  or this:
! .PP
  .Vb 1
  \&    your_script.pl name1=value1&name2=value2
  .Ve
  or even as newline-delimited parameters on standard input.
! .PP
  When debugging, you can use quotes and backslashes to escape 
  characters in the familiar shell manner, letting you place
  spaces and other funny characters in your parameter=value
  pairs:
! .PP
  .Vb 1
  \&   your_script.pl "name1='I am a long value'" "name2=two\e words"
  .Ve
***************
*** 1502,1514 ****
  The \fIdump()\fR method produces a string consisting of all the query's
  name/value pairs formatted nicely as a nested list.  This is useful
  for debugging purposes:
! .Sp
  .Vb 2
  \&    print $query->dump
  \&    
  .Ve
  Produces something that looks like:
! .Sp
  .Vb 11
  \&    <UL>
  \&    <LI>name1
--- 1692,1704 ----
  The \fIdump()\fR method produces a string consisting of all the query's
  name/value pairs formatted nicely as a nested list.  This is useful
  for debugging purposes:
! .PP
  .Vb 2
  \&    print $query->dump
  \&    
  .Ve
  Produces something that looks like:
! .PP
  .Vb 11
  \&    <UL>
  \&    <LI>name1
***************
*** 1525,1535 ****
  You can pass a value of \*(L'true\*(R' to \fIdump()\fR in order to get it to
  print the results out as plain text, suitable for incorporating
  into a <\s-1PRE\s0> section.
! .Sp
  As a shortcut, as of version 1.56 you can interpolate the entire 
  \s-1CGI\s0 object into a string and it will be replaced with the
  the a nice \s-1HTML\s0 dump shown above:
! .Sp
  .Vb 2
  \&    $query=new CGI;
  \&    print "<H2>Current Values</H2> $query\en";
--- 1715,1725 ----
  You can pass a value of \*(L'true\*(R' to \fIdump()\fR in order to get it to
  print the results out as plain text, suitable for incorporating
  into a <\s-1PRE\s0> section.
! .PP
  As a shortcut, as of version 1.56 you can interpolate the entire 
  \s-1CGI\s0 object into a string and it will be replaced with the
  the a nice \s-1HTML\s0 dump shown above:
! .PP
  .Vb 2
  \&    $query=new CGI;
  \&    print "<H2>Current Values</H2> $query\en";
***************
*** 1538,1544 ****
  .IX Header "FETCHING ENVIRONMENT VARIABLES"
  Some of the more useful environment variables can be fetched
  through this interface.  The methods are as follows:
! .Ip "\fBaccept()\fR" 4
  .IX Item "\fBaccept()\fR"
  Return a list of \s-1MIME\s0 types that the remote browser
  accepts. If you give this method a single argument
--- 1728,1734 ----
  .IX Header "FETCHING ENVIRONMENT VARIABLES"
  Some of the more useful environment variables can be fetched
  through this interface.  The methods are as follows:
! .Ip "\fBaccept()\fR" 0
  .IX Item "\fBaccept()\fR"
  Return a list of \s-1MIME\s0 types that the remote browser
  accepts. If you give this method a single argument
***************
*** 1548,1607 ****
  preference for this type from 0.0 (don't want) to 1.0.
  Glob types (e.g. text/*) in the browser's accept list
  are handled correctly.
! .Ip "\fBcookie()\fR" 4
! .IX Item "\fBcookie()\fR"
  Returns the \s-1HTTP_COOKIE\s0 variable, an \s-1HTTP\s0 extension
  implemented by Netscape browsers version 1.1
! and higher.  You can set this variable using the
! \fIheader()\fR \fB\-cookie\fR parameter, and the browser will
! pass it back to your script on all subsequent
! transactions.  You can use it as a session \s-1ID\s0 or
! even store a small number of state variables in it.
! Don't count on getting a cookie back from other
! browsers.
! .Ip "\fBuser_agent()\fR" 4
  .IX Item "\fBuser_agent()\fR"
  Returns the \s-1HTTP_USER_AGENT\s0 variable.  If you give
  this method a single argument, it will attempt to
  pattern match on it, allowing you to do something
  like \f(CW$query\fR\->\fIuser_agent\fR\|(netscape);
! .Ip "\fBpath_info()\fR" 4
  .IX Item "\fBpath_info()\fR"
  Returns additional path information from the script \s-1URL\s0.
  E.G. fetching /cgi-bin/your_script/additional/stuff will
  result in \f(CW$query\fR\->\fIpath_info()\fR returning
  \*(L"additional/stuff\*(R".
! .Ip "\fBpath_translated()\fR" 4
  .IX Item "\fBpath_translated()\fR"
  As per \fIpath_info()\fR but returns the additional
  path information translated into a physical path, e.g.
  \*(L"/usr/local/etc/httpd/htdocs/additional/stuff\*(R".
! .Ip "\fBremote_host()\fR" 4
  .IX Item "\fBremote_host()\fR"
  Returns either the remote host name or \s-1IP\s0 address.
  if the former is unavailable.
! .Ip "\fBscript_name()\fR Return the script name as a partial \s-1URL\s0, for self-refering scripts." 4
  .IX Item "\fBscript_name()\fR Return the script name as a partial \s-1URL\s0, for self-refering scripts."
! .Ip "\fBreferer()\fR" 4
  .IX Item "\fBreferer()\fR"
  Return the \s-1URL\s0 of the page the browser was viewing
  prior to fetching your script.  Not available for all
  browsers.
! .Ip "\fBauth_type ()\fR" 4
  .IX Item "\fBauth_type ()\fR"
  Return the authorization/verification method in use for this
  script, if any.
! .Ip "\fBremote_user ()\fR" 4
  .IX Item "\fBremote_user ()\fR"
  Return the authorization/verification name used for user
  verification, if this script is protected.
! .Ip "\fBuser_name ()\fR" 4
  .IX Item "\fBuser_name ()\fR"
  Attempt to obtain the remote user's name, using a variety
  of different techniques.  This only works with older browsers
  such as Mosaic.  Netscape does not reliably report the user
  name!
! .Ip "\fBrequest_method()\fR" 4
  .IX Item "\fBrequest_method()\fR"
  Returns the method used to access your script, usually
  one of \*(L'\s-1POST\s0\*(R', \*(L'\s-1GET\s0\*(R' or \*(L'\s-1HEAD\s0\*(R'.
--- 1738,1794 ----
  preference for this type from 0.0 (don't want) to 1.0.
  Glob types (e.g. text/*) in the browser's accept list
  are handled correctly.
! .Ip "\fBraw_cookie()\fR" 0
! .IX Item "\fBraw_cookie()\fR"
  Returns the \s-1HTTP_COOKIE\s0 variable, an \s-1HTTP\s0 extension
  implemented by Netscape browsers version 1.1
! and higher.  Cookies have a special format, and this 
! method call just returns the raw form (?cookie dough).
! See \fIcookie()\fR for ways of setting and retrieving
! cooked cookies.
! .Ip "\fBuser_agent()\fR" 0
  .IX Item "\fBuser_agent()\fR"
  Returns the \s-1HTTP_USER_AGENT\s0 variable.  If you give
  this method a single argument, it will attempt to
  pattern match on it, allowing you to do something
  like \f(CW$query\fR\->\fIuser_agent\fR\|(netscape);
! .Ip "\fBpath_info()\fR" 0
  .IX Item "\fBpath_info()\fR"
  Returns additional path information from the script \s-1URL\s0.
  E.G. fetching /cgi-bin/your_script/additional/stuff will
  result in \f(CW$query\fR\->\fIpath_info()\fR returning
  \*(L"additional/stuff\*(R".
! .Ip "\fBpath_translated()\fR" 0
  .IX Item "\fBpath_translated()\fR"
  As per \fIpath_info()\fR but returns the additional
  path information translated into a physical path, e.g.
  \*(L"/usr/local/etc/httpd/htdocs/additional/stuff\*(R".
! .Ip "\fBremote_host()\fR" 0
  .IX Item "\fBremote_host()\fR"
  Returns either the remote host name or \s-1IP\s0 address.
  if the former is unavailable.
! .Ip "\fBscript_name()\fR Return the script name as a partial \s-1URL\s0, for self-refering scripts." 0
  .IX Item "\fBscript_name()\fR Return the script name as a partial \s-1URL\s0, for self-refering scripts."
! .Ip "\fBreferer()\fR" 0
  .IX Item "\fBreferer()\fR"
  Return the \s-1URL\s0 of the page the browser was viewing
  prior to fetching your script.  Not available for all
  browsers.
! .Ip "\fBauth_type ()\fR" 0
  .IX Item "\fBauth_type ()\fR"
  Return the authorization/verification method in use for this
  script, if any.
! .Ip "\fBremote_user ()\fR" 0
  .IX Item "\fBremote_user ()\fR"
  Return the authorization/verification name used for user
  verification, if this script is protected.
! .Ip "\fBuser_name ()\fR" 0
  .IX Item "\fBuser_name ()\fR"
  Attempt to obtain the remote user's name, using a variety
  of different techniques.  This only works with older browsers
  such as Mosaic.  Netscape does not reliably report the user
  name!
! .Ip "\fBrequest_method()\fR" 0
  .IX Item "\fBrequest_method()\fR"
  Returns the method used to access your script, usually
  one of \*(L'\s-1POST\s0\*(R', \*(L'\s-1GET\s0\*(R' or \*(L'\s-1HEAD\s0\*(R'.
***************
*** 1612,1661 ****
  notice remain attached to the file.  You may modify this module as you 
  wish, but if you redistribute a modified version, please attach a note
  listing the modifications you have made.
! .Sp
  Address bug reports and comments to:
  lstein@genome.wi.mit.edu
  .SH "CREDITS"
  .IX Header "CREDITS"
  Thanks very much to:
! .Ip "Matt Heffron (heffron@falstaff.css.beckman.com)" 8
  .IX Item "Matt Heffron (heffron@falstaff.css.beckman.com)"
! .Ip "James Taylor (james.taylor@srs.gov)" 8
  .IX Item "James Taylor (james.taylor@srs.gov)"
! .Ip "Scott Anguish <sanguish@digifix.com>" 8
  .IX Item "Scott Anguish <sanguish@digifix.com>"
! .Ip "Mike Jewell (mlj3u@virginia.edu)" 8
  .IX Item "Mike Jewell (mlj3u@virginia.edu)"
! .Ip "Timothy Shimmin (tes@kbs.citri.edu.au)" 8
  .IX Item "Timothy Shimmin (tes@kbs.citri.edu.au)"
! .Ip "Joergen Haegg (jh@axis.se)" 8
  .IX Item "Joergen Haegg (jh@axis.se)"
! .Ip "Laurent Delfosse (delfosse@csgrad1.cs.wvu.edu)" 8
  .IX Item "Laurent Delfosse (delfosse@csgrad1.cs.wvu.edu)"
! .Ip "Richard Resnick (applepi1@aol.com)" 8
  .IX Item "Richard Resnick (applepi1@aol.com)"
! .Ip "Craig Bishop (csb@barwonwater.vic.gov.au)" 8
  .IX Item "Craig Bishop (csb@barwonwater.vic.gov.au)"
! .Ip "Tony Curtis (tc@vcpc.univie.ac.at)" 8
  .IX Item "Tony Curtis (tc@vcpc.univie.ac.at)"
! .Ip "Tim Bunce (Tim.Bunce@ig.co.uk)" 8
  .IX Item "Tim Bunce (Tim.Bunce@ig.co.uk)"
! .Ip "Tom Christiansen (tchrist@convex.com)" 8
  .IX Item "Tom Christiansen (tchrist@convex.com)"
! .Ip "Andreas Koenig (k@franz.ww.\s-1TU\s0\-Berlin.\s-1DE\s0)" 8
  .IX Item "Andreas Koenig (k@franz.ww.\s-1TU\s0\-Berlin.\s-1DE\s0)"
! .Ip "Tim MacKenzie (Tim.MacKenzie@fulcrum.com.au)" 8
  .IX Item "Tim MacKenzie (Tim.MacKenzie@fulcrum.com.au)"
! .Ip "Kevin B. Hendricks (kbhend@dogwood.tyler.wm.edu)" 8
  .IX Item "Kevin B. Hendricks (kbhend@dogwood.tyler.wm.edu)"
! .Ip "Stephen Dahmen (joyfire@inxpress.net)" 8
  .IX Item "Stephen Dahmen (joyfire@inxpress.net)"
! .Ip "...and many many more..." 8
  .IX Item "...and many many more..."
  for suggestions and bug fixes.
  .SH "A COMPLETE EXAMPLE OF A SIMPLE FORM\-BASED SCRIPT"
  .IX Header "A COMPLETE EXAMPLE OF A SIMPLE FORM\-BASED SCRIPT"
! .Sp
  .Vb 5
  \&        #!/usr/local/bin/perl
  \&     
--- 1799,1848 ----
  notice remain attached to the file.  You may modify this module as you 
  wish, but if you redistribute a modified version, please attach a note
  listing the modifications you have made.
! .PP
  Address bug reports and comments to:
  lstein@genome.wi.mit.edu
  .SH "CREDITS"
  .IX Header "CREDITS"
  Thanks very much to:
! .Ip "Matt Heffron (heffron@falstaff.css.beckman.com)" 4
  .IX Item "Matt Heffron (heffron@falstaff.css.beckman.com)"
! .Ip "James Taylor (james.taylor@srs.gov)" 4
  .IX Item "James Taylor (james.taylor@srs.gov)"
! .Ip "Scott Anguish <sanguish@digifix.com>" 4
  .IX Item "Scott Anguish <sanguish@digifix.com>"
! .Ip "Mike Jewell (mlj3u@virginia.edu)" 4
  .IX Item "Mike Jewell (mlj3u@virginia.edu)"
! .Ip "Timothy Shimmin (tes@kbs.citri.edu.au)" 4
  .IX Item "Timothy Shimmin (tes@kbs.citri.edu.au)"
! .Ip "Joergen Haegg (jh@axis.se)" 4
  .IX Item "Joergen Haegg (jh@axis.se)"
! .Ip "Laurent Delfosse (delfosse@csgrad1.cs.wvu.edu)" 4
  .IX Item "Laurent Delfosse (delfosse@csgrad1.cs.wvu.edu)"
! .Ip "Richard Resnick (applepi1@aol.com)" 4
  .IX Item "Richard Resnick (applepi1@aol.com)"
! .Ip "Craig Bishop (csb@barwonwater.vic.gov.au)" 4
  .IX Item "Craig Bishop (csb@barwonwater.vic.gov.au)"
! .Ip "Tony Curtis (tc@vcpc.univie.ac.at)" 4
  .IX Item "Tony Curtis (tc@vcpc.univie.ac.at)"
! .Ip "Tim Bunce (Tim.Bunce@ig.co.uk)" 4
  .IX Item "Tim Bunce (Tim.Bunce@ig.co.uk)"
! .Ip "Tom Christiansen (tchrist@convex.com)" 4
  .IX Item "Tom Christiansen (tchrist@convex.com)"
! .Ip "Andreas Koenig (k@franz.ww.\s-1TU\s0\-Berlin.\s-1DE\s0)" 4
  .IX Item "Andreas Koenig (k@franz.ww.\s-1TU\s0\-Berlin.\s-1DE\s0)"
! .Ip "Tim MacKenzie (Tim.MacKenzie@fulcrum.com.au)" 4
  .IX Item "Tim MacKenzie (Tim.MacKenzie@fulcrum.com.au)"
! .Ip "Kevin B. Hendricks (kbhend@dogwood.tyler.wm.edu)" 4
  .IX Item "Kevin B. Hendricks (kbhend@dogwood.tyler.wm.edu)"
! .Ip "Stephen Dahmen (joyfire@inxpress.net)" 4
  .IX Item "Stephen Dahmen (joyfire@inxpress.net)"
! .Ip "...and many many more..." 4
  .IX Item "...and many many more..."
  for suggestions and bug fixes.
  .SH "A COMPLETE EXAMPLE OF A SIMPLE FORM\-BASED SCRIPT"
  .IX Header "A COMPLETE EXAMPLE OF A SIMPLE FORM\-BASED SCRIPT"
! .PP
  .Vb 5
  \&        #!/usr/local/bin/perl
  \&     
***************
*** 1749,1755 ****
  things, such as handling URLs, parsing CGI input, writing HTML, etc., that
  should be done in separate modules.  It should be discarded in favor of
  the CGI::* modules, but somehow I continue to work on it.
! .Sp
  Note that the code is truly contorted in order to avoid spurious
  warnings when programs are run with the \fB\-w\fR switch.
  .SH "SEE ALSO"
--- 1936,1942 ----
  things, such as handling URLs, parsing CGI input, writing HTML, etc., that
  should be done in separate modules.  It should be discarded in favor of
  the CGI::* modules, but somehow I continue to work on it.
! .PP
  Note that the code is truly contorted in order to avoid spurious
  warnings when programs are run with the \fB\-w\fR switch.
  .SH "SEE ALSO"
diff -cNr CGI-modules-2.75.orig/CGI.pm CGI-modules-2.75/CGI.pm
*** CGI-modules-2.75.orig/CGI.pm	Tue Apr  2 23:54:16 1996
--- CGI-modules-2.75/CGI.pm	Mon Apr 29 23:54:48 1996
***************
*** 22,39 ****
  #   http://www-genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
  #   ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
  
  $SelfLoader::DEBUG=0;
  
! $CGI::revision = '$Id: CGI.pm,v 2.18 1996/03/30 15:21:31 lstein Exp $';
! $CGI::VERSION='2.18';
  
  # ------------------ START OF THE LIBRARY ------------
- %OVERLOAD = ('""'=>'as_string');
- sub URL_ENCODED {'application/x-www-form-urlencoded'; }
- sub MULTIPART { 'multipart/form-data'; }
  
! # NT/WINDOWS USERS -- SET $needs_binmode to 1 !!
! $needs_binmode = 0;
  
  # This is really "\r\n", but the meaning of \n is different
  # in MacPerl, so we resort to octal here.
--- 22,54 ----
  #   http://www-genome.wi.mit.edu/ftp/pub/software/WWW/cgi_docs.html
  #   ftp://ftp-genome.wi.mit.edu/pub/software/WWW/
  
+ # Set this to 1 to enable copious SelfLoader debugging messages
  $SelfLoader::DEBUG=0;
  
! $CGI::revision = '$Id: CGI.pm,v 2.19 1996/04/22 18:30:19 lstein Exp $';
! $CGI::VERSION='2.19';
  
  # ------------------ START OF THE LIBRARY ------------
  
! # CHANGE THIS VARIABLE FOR YOUR OPERATING SYSTEM
! $OS = 'UNIX';
! # $OS = 'MACINTOSH';
! # $OS = 'WINDOWS';
! # $OS = 'NT';
! # $OS = 'VMS';
! 
! # Some OS logic.  Binary mode enabled on DOS, NT and VMS
! $needs_binmode = $OS=~/WINDOWS|NT|VMS/;
! 
! # The path separator is a slash, backslash or semicolon, depending
! # on the paltform.
! $SL = {
!     UNIX=>'/',
!     WINDOWS=>'\\',
!     NT=>'\\',
!     MACINTOSH=>':',
!     VMS=>'\\'
!     }->{$OS};
  
  # This is really "\r\n", but the meaning of \n is different
  # in MacPerl, so we resort to octal here.
***************
*** 45,50 ****
--- 60,67 ----
      binmode(main::STDERR);
  }
  
+ %OVERLOAD = ('""'=>'as_string');
+ 
  #### Method: new
  # The new routine.  This will check the current environment
  # for an existing query string, and initialize itself, if so.
***************
*** 83,103 ****
  sub param {
      my($self,@p) = @_;
      return $self->all_parameters unless @p;
  
!     my($name,$value,@other) = $self->rearrange([NAME,[VALUE,VALUES]],@p);
!     my(@values);
  
!     if (defined($value) && ref($value) && (ref($value) eq 'ARRAY')) {
! 	@values = @{$value};
!     } else {
! 	foreach ($value,@other) {
! 	    push(@values,$_) if defined($_) && ($_ ne '');
  	}
!     }
!     # If values is provided, then we set it.
!     if (@values) {
! 	$self->add_parameter($name);
! 	$self->{$name}=[@values];
      }
  
      return () unless $self->{$name};
--- 100,127 ----
  sub param {
      my($self,@p) = @_;
      return $self->all_parameters unless @p;
+     my($name,$value,@other);
  
!     # For compatability between old calling style and use_named_parameters() style, 
!     # we have to special case for a single parameter present.
!     if (@p > 1) {
! 	($name,$value,@other) = $self->rearrange([NAME,[DEFAULT,VALUE,VALUES]],@p);
! 	my(@values);
  
! 	if ($p[0]=~/^-/ || $self->use_named_parameters) {
! 	    @values = ref($value) ? @{$value} : $value;
! 	} else {
! 	    foreach ($value,@other) {
! 		push(@values,$_) if defined($_) && ($_ ne '');
! 	    }
  	}
! 	# If values is provided, then we set it.
! 	if (@values) {
! 	    $self->add_parameter($name);
! 	    $self->{$name}=[@values];
! 	}
!     } else {
! 	$name = $p[0];
      }
  
      return () unless $self->{$name};
***************
*** 138,155 ****
      import_names(@_);
  }
  
- #### Method: keywords
- # Keywords acts a bit differently.  Calling it in a list context
- # returns the list of keywords.  
- # Calling it in a scalar context gives you the size of the list.
- ####
- sub keywords {
-     my($self,@values) = @_;
-     # If values is provided, then we set it.
-     $self->{'keywords'}=[@values] if @values;
-     my(@result) = @{$self->{'keywords'}};
-     @result;
- }
  
  #### Method: use_named_parameters
  # Force CGI.pm to use named parameter-style method calls
--- 162,167 ----
***************
*** 414,420 ****
  
  package TempFile;
  
! @TEMP=('/usr/tmp','/var/tmp','/tmp',);
  foreach (@TEMP) {
      do {$TMPDIRECTORY = $_; last} if -w $_;
  }
--- 426,433 ----
  
  package TempFile;
  
! $SL = $CGI::SL;
! @TEMP=("${SL}usr${SL}tmp","${SL}var${SL}tmp","${SL}tmp","${SL}temp","${SL}Temporary Items");
  foreach (@TEMP) {
      do {$TMPDIRECTORY = $_; last} if -w $_;
  }
***************
*** 447,452 ****
--- 460,520 ----
  
  # Everything below here is autoloaded
  
+ sub URL_ENCODED {'application/x-www-form-urlencoded'; }
+ sub MULTIPART { 'multipart/form-data'; }
+ 
+ #### Method: keywords
+ # Keywords acts a bit differently.  Calling it in a list context
+ # returns the list of keywords.  
+ # Calling it in a scalar context gives you the size of the list.
+ ####
+ sub keywords {
+     my($self,@values) = @_;
+     # If values is provided, then we set it.
+     $self->{'keywords'}=[@values] if @values;
+     my(@result) = @{$self->{'keywords'}};
+     @result;
+ }
+ 
+ # These are some tie() interfaces for compatability
+ # with Steve Brenner's cgi-lib.pl routines
+ sub ReadParse {
+     local(*in);
+     if (@_) {
+ 	*in = $_[0];
+     } else {
+ 	my $pkg = caller();
+ 	*in=*{"${pkg}::in"};
+     }
+     tie(%in,CGI);
+ }
+ sub TIEHASH { 
+     return new CGI;
+ }
+ sub STORE {
+     $_[0]->param($_[1],split("\0",$_[2]));
+ }
+ sub FETCH {
+     return $_[0] if $_[1] eq 'CGI';
+     return join("\0",$_[0]->param($_[1]));
+ }
+ sub FIRSTKEY {
+     $_[0]->{'.iterator'}=0;
+     $_[0]->{'.parameters'}->[$_[0]->{'.iterator'}++];
+ }
+ sub NEXTKEY {
+     $_[0]->{'.parameters'}->[$_[0]->{'.iterator'}++];
+ }
+ sub EXISTS {
+     exists $_[0]->{$_[1]};
+ }
+ sub DELETE {
+     $_[0]->delete($_[1]);
+ }
+ sub CLEAR {
+     %{$_[0]}=();
+ }
+ 
  #### Method: autoescape
  # If you won't to turn off the autoescaping features,
  # call this method with undef as the argument
***************
*** 512,519 ****
  sub header {
      my($self,@p) = @_;
  
!     my($type,$status,$cookie,$target,@other) = 
! 	$self->rearrange([TYPE,STATUS,COOKIE,TARGET],@p);
  
      # rearrange() was designed for the HTML portion, so we
      # need to fix it up a little.
--- 580,587 ----
  sub header {
      my($self,@p) = @_;
  
!     my($type,$status,$cookie,$target,$expires,@other) = 
! 	$self->rearrange([TYPE,STATUS,COOKIE,TARGET,EXPIRES],@p);
  
      # rearrange() was designed for the HTML portion, so we
      # need to fix it up a little.
***************
*** 528,535 ****
      push(@other,"Pragma: no-cache") if $self->cache();
      my(@header);
      push(@header,"Status: $status") if $status;
-     push(@header,"Set-cookie: $cookie") if $cookie;
      push(@header,"Window-target: $target") if $target;
      push(@header,@other) if @other;
      push(@header,"Content-type: $type");
  
--- 596,610 ----
      push(@other,"Pragma: no-cache") if $self->cache();
      my(@header);
      push(@header,"Status: $status") if $status;
      push(@header,"Window-target: $target") if $target;
+     # push all the cookies -- there may be several
+     if ($cookie) {
+ 	my(@cookie) = ref($cookie) ? @{$cookie} : $cookie;
+ 	foreach (@cookie) {
+ 	    push(@header,"Set-cookie: $_");
+ 	}
+     }
+     push(@header,"Expires: " . &expires($expires)) if $expires;
      push(@header,@other) if @other;
      push(@header,"Content-type: $type");
  
***************
*** 801,807 ****
      my($val) = '';
      $val = qq/VALUE="$value"/ if $value;
      $script = qq/ONCLICK="$script"/ if $script;
!     return qq/<INPUT TYPE="submit" $name $val $script @other>/;
  }
  
  #### Method: submit
--- 876,882 ----
      my($val) = '';
      $val = qq/VALUE="$value"/ if $value;
      $script = qq/ONCLICK="$script"/ if $script;
!     return qq/<INPUT TYPE="button" $name $val $script @other>/;
  }
  
  #### Method: submit
***************
*** 1234,1239 ****
--- 1309,1403 ----
      return $name;
  }
  
+ #### Method: cookie
+ # Set or read a cookie from the specified name.
+ # Cookie can then be passed to header().
+ # Usual rules apply to the stickiness of -value.
+ #  Parameters:
+ #   -name -> name for this cookie (required)
+ #   -value -> value of this cookie (scalar, array or hash) 
+ #   -path -> paths for which this cookie is valid (optional)
+ #   -domain -> internet domain in which this cookie is valid (optional)
+ #   -secure -> if true, cookie only passed through secure channel (optional)
+ #   -expires -> expiry date in format Wdy, DD-Mon-YY HH:MM:SS GMT (optional)
+ ####
+ sub cookie {
+     my($self,@p) = @_;
+     my($name,$value,$path,$domain,$secure,$expires,$override) =
+ 	$self->rearrange([NAME,[DEFAULT,VALUE,VALUES],PATH,DOMAIN,SECURE,
+ 			  EXPIRES,[OVERRIDE,FORCE]],@p);
+     # if no value is supplied, then we retrieve the
+     # value of the cookie, if any.  For efficiency, we cache the parsed
+     # cookie in our state variables.
+     unless ($value) {
+ 	unless ($self->{'.cookies'}) {
+ 	    my(@pairs) = split("; ",$self->raw_cookie);
+ 	    foreach (@pairs) {
+ 		my($key,$value) = split("=");
+ 		my(@values) = map unescape($_),split('&',$value);
+ 		$self->{'.cookies'}->{unescape($key)} = [@values];
+ 	    }
+ 	}
+ 	return wantarray ? @{$self->{'.cookies'}->{$name}} : $self->{'.cookies'}->{$name}->[0];
+     }
+     my(@values);
+     # pull out our parameters
+     if ($self->param($name) && !$override) {
+ 	@values = map escape($_),$self->param($name);
+     } else {
+ 	@values = map escape($_),
+ 	          ref($value) eq 'ARRAY' ? @$value : (ref($value) eq 'HASH' ? %$value : $value);
+     }
+ 
+     my(@constant_values);
+     push(@constant_values,"domain=$domain") if $domain;
+     push(@constant_values,"path=$path") if $path;
+     push(@constant_values,"expires=".&expires($expires)) if $expires;
+     push(@constant_values,'secure') if $secure;
+ 
+     my($key) = &escape($name);
+     my($cookie) = join("=",$key,join("&",@values));
+     return join("; ",$cookie,@constant_values);
+ }
+ 
+ # This internal routine creates an expires string exactly some number of
+ # hours from the current time in GMT.  This is the format
+ # required by Netscape cookies, and I think it works for the HTTP
+ # Expires: header as well.
+ sub expires {
+     my($time) = @_;
+     my(@MON)=qw/Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec/;
+     my(@WDAY) = qw/Sunday Monday Tuesday Wednesday Thursday Friday Saturday/;
+     my(%mult) = ('s'=>1,
+ 		 'm'=>60,
+ 		 'h'=>60*60,
+ 		 'd'=>60*60*24,
+ 		 'M'=>60*60*24*30,
+ 		 'y'=>60*60*24*365);
+     # format for time can be in any of the forms...
+     # "now" -- expire immediately
+     # "+180s" -- in 180 seconds
+     # "+2m" -- in 2 minutes
+     # "+12h" -- in 12 hours
+     # "+1d"  -- in 1 day
+     # "+3M"  -- in 3 months
+     # "+2y"  -- in 2 years
+     # "-3m"  -- 3 minutes ago(!)
+     # If you don't supply one of these forms, we assume you are
+     # specifying the date yourself
+     my($offset);
+     if (!$time || ($time eq 'now')) {
+ 	$offset = 0;
+     } elsif ($time=~/^([+-]?\d+)([mhdMy]?)/) {
+ 	$offset = ($mult{$2} || 1)*$1;
+     } else {
+ 	return $time;
+     }
+     my($sec,$min,$hour,$mday,$mon,$year,$wday) = gmtime(time+$offset);
+     return sprintf("%s, %02d-%s-%02d %02d:%02d:%02d GMT",
+ 		   $WDAY[$wday],$mday,$MON[$mon],$year,$hour,$min,$sec);
+ }
+ 
  ###############################################
  # OTHER INFORMATION PROVIDED BY THE ENVIRONMENT
  ###############################################
***************
*** 1338,1344 ****
  # To set the magic cookie for new transations,
  # try print $q->header('-Set-cookie'=>'my cookie')
  ####
! sub cookie {
      return $ENV{'HTTP_COOKIE'};
  }
  
--- 1502,1508 ----
  # To set the magic cookie for new transations,
  # try print $q->header('-Set-cookie'=>'my cookie')
  ####
! sub raw_cookie {
      return $ENV{'HTTP_COOKIE'};
  }
  
***************
*** 1644,1653 ****
  
  # Create a temporary file that will be automatically
  # unlinked when finished.
  sub new {
      my($package) = @_;
      $SEQUENCE++;
!     my $directory = "$TMPDIRECTORY/$SEQUENCE";
      return bless \$directory;
  }
  
--- 1808,1818 ----
  
  # Create a temporary file that will be automatically
  # unlinked when finished.
+ # MACPERL users see the note below!
  sub new {
      my($package) = @_;
      $SEQUENCE++;
!     my $directory = "${TMPDIRECTORY}${SL}${SEQUENCE}";
      return bless \$directory;
  }
  
***************
*** 1873,1880 ****
  the -override parameter accepted by all methods that generate
  form elements.)
  
! param() also recognizes the named parameter style of calling described
! below:
  
      $query->param(-name=>'foo',-values=>['an','array','of','values']);
  
--- 2038,2045 ----
  the -override parameter accepted by all methods that generate
  form elements.)
  
! param() also recognizes a named parameter style of calling described
! in more detail later:
  
      $query->param(-name=>'foo',-values=>['an','array','of','values']);
  
***************
*** 1915,1922 ****
  
  =head2 CREATING A SELF-REFERENCING URL THAT PRESERVES STATE INFORMATION:
  
!     $myself = $query->self_url
!     print "<A HREF=$myself>I'm talking to myself.</A>
  
  self_url() will return a URL, that, when selected, will reinvoke
  this script with all its state information intact.  This is most
--- 2080,2087 ----
  
  =head2 CREATING A SELF-REFERENCING URL THAT PRESERVES STATE INFORMATION:
  
!     $myself = $query->self_url;
!     print "<A HREF=$myself>I'm talking to myself.</A>";
  
  self_url() will return a URL, that, when selected, will reinvoke
  this script with all its state information intact.  This is most
***************
*** 1924,1939 ****
  internal anchors but you don't want to disrupt the current contents
  of the form(s).  Something like this will do the trick.
  
!      $myself = $query->self_url
!      print "<A HREF=$myself#table1>See table 1</A>
!      print "<A HREF=$myself#table2>See table 2</A>
!      print "<A HREF=$myself#yourself>See for yourself</A>
  
  If you don't want to get the whole query string, call
  the method url() to return just the URL for the script:
  
!     $myself = $query->url
!     print "<A HREF=$myself>No query string in this baby!</A>
  
  =head2 CALLING CGI FUNCTIONS THAT TAKE MULTIPLE ARGUMENTS
  
--- 2089,2140 ----
  internal anchors but you don't want to disrupt the current contents
  of the form(s).  Something like this will do the trick.
  
!      $myself = $query->self_url;
!      print "<A HREF=$myself#table1>See table 1</A>";
!      print "<A HREF=$myself#table2>See table 2</A>";
!      print "<A HREF=$myself#yourself>See for yourself</A>";
  
  If you don't want to get the whole query string, call
  the method url() to return just the URL for the script:
  
!     $myself = $query->url;
!     print "<A HREF=$myself>No query string in this baby!</A>\n";
! 
! You can also retrieve the unprocessed query string with query_string():
! 
!     $the_string = $query->query_string;
! 
! =head2 COMPATABILITY WITH CGI-LIB.PL
! 
! To make it easier to port existing programs that use cgi-lib.pl
! the compatability routine "ReadParse" is provided.  Porting is
! simple:
! 
! OLD VERSION
!     require "cgi-lib.pl";
!     &ReadParse;
!     print "The value of the antique is $in{antique}.\n";
! 
! NEW VERSION
!     use CGI;
!     CGI::ReadParse
!     print "The value of the antique is $in{antique}.\n";
! 
! CGI.pm's ReadParse() routine creates a tied variable named %in,
! which can be accessed to obtain the query variables.  Like
! ReadParse, you can also provide your own variable.  Infrequently
! used features of ReadParse, such as the creation of @in and $in 
! variables, are not supported.
! 
! Once you use ReadParse, you can retrieve the query object itself
! this way:
! 
!     $q = $in{CGI};
!     print $q->textfield(-name=>'wow',
!                         -value=>'does this really work?');
! 
! This allows you to start using the more interesting features
! of CGI.pm without rewriting your old scripts from scratch.
  
  =head2 CALLING CGI FUNCTIONS THAT TAKE MULTIPLE ARGUMENTS
  
***************
*** 2001,2007 ****
  
          print $query->header(-type=>'image/gif',
  			     -status=>'402 Payment required',
! 			     -cookie=>&get_random_cookie(),
  			     -Cost=>'$2.00');
  
  header() returns the Content-type: header.  You can provide your own
--- 2202,2209 ----
  
          print $query->header(-type=>'image/gif',
  			     -status=>'402 Payment required',
! 			     -expires=>'+3d',
! 			     -cookie=>$cookie,
  			     -Cost=>'$2.00');
  
  header() returns the Content-type: header.  You can provide your own
***************
*** 2015,2035 ****
  
  The last example shows the named argument style for passing arguments
  to the CGI methods using named parameters.  Recognized parameters are
! B<-type>, B<-status>, and B<-cookie>.  Any other parameters will 
! be stripped of their initial hyphens and turned into header fields.
  
! The cookie parameter generates a header that tells the browser to provide
  a "magic cookie" during all subsequent transactions with your script.
! The value of the cookie can be almost anything you like (I doubt that
! newlines will work though), and can be used as a unique session ID
! or even to store a small number of state variables.  You can retrieve
! the value of the browser's magic cookie with the cookie() method.
  
  As of version 1.56, all HTTP headers produced by CGI.pm contain the
  Pragma: no-cache instruction.  However, as of version 1.57, this is
! turned OFF by default because it causes Netscape 2.0 beta to produce
! an annoying warning message every time the "back" button is hit.  Turn
! it on again with the method cache().
  
  =head2 GENERATING A REDIRECTION INSTRUCTION
  
--- 2217,2258 ----
  
  The last example shows the named argument style for passing arguments
  to the CGI methods using named parameters.  Recognized parameters are
! B<-type>, B<-status>, B<-expires>, and B<-cookie>.  Any other 
! parameters will be stripped of their initial hyphens and turned into
! header fields, allowing you to specify any HTTP header you desire.
! 
! Most browsers will not cache the output from CGI scripts.  Every time
! the browser reloads the page, the script is invoked anew.  You can
! change this behavior with the B<-expires> parameter.  When you specify
! an absolute or relative expiration interval with this parameter, some
! browsers and proxy servers will cache the script's output until the
! indicated expiration date.  The following forms are all valid for the
! -expires field:
! 
! 	+30s                              30 seconds from now
! 	+10m                              ten minutes from now
! 	+1h	                          one hour from now
!         -1d                               yesterday (i.e. "ASAP!")
! 	now                               immediately
! 	+3M                               in three months
!         +10y                              in ten years time
! 	Thursday, 25-Apr-96 00:40:33 GMT  at the indicated time & date
! 
! (CGI::expires() is the static function call used internally that turns
! relative time intervals into HTTP dates.  You can call it directly if
! you wish.)
  
! The B<-cookie> parameter generates a header that tells the browser to provide
  a "magic cookie" during all subsequent transactions with your script.
! Netscape cookies have a special format that includes interesting attributes
! such as expiration time.  Use the cookie() method to create and retrieve
! session cookies.
  
  As of version 1.56, all HTTP headers produced by CGI.pm contain the
  Pragma: no-cache instruction.  However, as of version 1.57, this is
! turned OFF by default because it causes Netscape 2.0 and higher to
! produce an annoying warning message every time the "back" button is
! hit.  Turn it on again with the method cache().
  
  =head2 GENERATING A REDIRECTION INSTRUCTION
  
***************
*** 2980,2985 ****
--- 3203,3349 ----
  non-Netscape browsers this form element will probably not even
  display.
  
+ =head1 NETSCAPE COOKIES
+ 
+ Netscape browsers versions 1.1 and higher support a so-called
+ "cookie" designed to help maintain state within a browser session.
+ CGI.pm has several methods that support cookies.
+ 
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+ them to the browser in the HTTP header.  The browser maintains a list
+ of cookies that belong to a particular Web server, and returns them
+ to the CGI script during subsequent interactions.
+ 
+ In addition to the required name=value pair, each cookie has several
+ optional attributes:
+ 
+ =over 4
+ 
+ =item 1. an expiration time
+ 
+ This is a time/date string (in a special GMT format) that indicates
+ when a cookie expires.  The cookie will be saved and returned to your
+ script until this expiration date is reached if the user exits
+ Netscape and restarts it.  If an expiration date isn't specified, the cookie
+ will remain active until the user quits Netscape.
+ 
+ =item 2. a domain
+ 
+ This is a partial or complete domain name for which the cookie is 
+ valid.  The browser will return the cookie to any host that matches
+ the partial domain name.  For example, if you specify a domain name
+ of ".capricorn.com", then Netscape will return the cookie to
+ Web servers running on any of the machines "www.capricorn.com", 
+ "www2.capricorn.com", "feckless.capricorn.com", etc.  Domain names
+ must contain at least two periods to prevent attempts to match
+ on top level domains like ".edu".  If no domain is specified, then
+ the browser will only return the cookie to servers on the host the
+ cookie originated from.
+ 
+ =item 3. a path
+ 
+ If you provide a cookie path attribute, the browser will check it
+ against your script's URL before returning the cookie.  For example,
+ if you specify the path "/cgi-bin", then the cookie will be returned
+ to each of the scripts "/cgi-bin/tally.pl", "/cgi-bin/order.pl",
+ and "/cgi-bin/customer_service/complain.pl", but not to the script
+ "/cgi-private/site_admin.pl".  By default, path is set to "/", which
+ causes the cookie to be sent to any CGI script on your site.
+ 
+ =item 4. a "secure" flag
+ 
+ If the "secure" attribute is set, the cookie will only be sent to your
+ script if the CGI request is occurring on a secure channel, such as SSL.
+ 
+ =back
+ 
+ The interface to Netscape cookies is the B<cookie()> method:
+ 
+     $cookie = $query->cookie(-name=>'sessionID',
+ 			     -value=>'xyzzy',
+ 			     -expires=>'+1h',
+ 			     -path=>'/cgi-bin/database',
+ 			     -domain=>'.capricorn.org',
+ 			     -secure=>1);
+     print $query->header(-cookie=>$cookie);
+ 
+ B<cookie()> creates a new cookie.  Its parameters include:
+ 
+ =over 4
+ 
+ =item B<-name>
+ 
+ The name of the cookie (required).  This can be any string at all.
+ Although Netscape limits its cookie names to non-whitespace
+ alphanumeric characters, CGI.pm removes this restriction by escaping
+ and unescaping cookies behind the scenes.
+ 
+ =item B<-value>
+ 
+ The value of the cookie.  This can be any scalar value,
+ array reference, or even associative array reference.  For example,
+ you can store an entire associative array into a cookie this way:
+ 
+ 	$cookie=$query->cookie(-name=>'family information',
+                                -value=>\%childrens_ages);
+ 
+ =item B<-path>
+ 
+ The optional partial path for which this cookie will be valid, as described
+ above.
+ 
+ =item B<-domain>
+ 
+ The optional partial domain for which this cookie will be valid, as described
+ above.
+ 
+ =item B<-expires>
+ 
+ The optional expiration date for this cookie.  The format is as described 
+ in the section on the B<header()> method:
+ 
+ 	"+1h"  one hour from now
+ 
+ =item B<-secure>
+ 
+ If set to true, this cookie will only be used within a secure
+ SSL session.
+ 
+ =back
+ 
+ The cookie created by cookie() must be incorporated into the HTTP
+ header within the string returned by the header() method:
+ 
+ 	print $query->header(-cookie=>$my_cookie);
+ 
+ To create multiple cookies, give header() an array reference:
+ 
+ 	$cookie1 = $query->cookie(-name=>'riddle_name',
+                                   -value=>"The Sphynx's Question");
+         $cookie2 = $query->cookie(-name=>'answers',
+                                   -value=>\%answers);
+         print $query->header(-cookie=>[$cookie1,$cookie2]);
+ 
+ To retrieve a cookie, request it by name by calling cookie()
+ method without the B<-value> parameter:
+ 
+ 	use CGI;
+ 	$query = new CGI;
+ 	%answers = $query->cookie(-name=>'answers');
+ 	# $query->cookie('answers') will work too!
+ 
+ See the B<cookie.cgi> example script for some ideas on how to use
+ cookies effectively.
+ 
+ B<NOTE:> There appear to be some (undocumented) restrictions on
+ Netscape cookies.  In Netscape 2.01, at least, I haven't been able to
+ set more than three cookies at a time.  There may also be limits on
+ the length of cookies.  If you need to store a lot of information,
+ it's probably better to create a unique session ID, store it in a
+ cookie, and use the session ID to locate an external file/database
+ saved on the server's side of the connection.
+ 
  =head1 WORKING WITH NETSCAPE FRAMES
  
  It's possible for CGI.pm scripts to write into several browser
***************
*** 3025,3030 ****
--- 3389,3396 ----
  into the frame named "ResultsWindow".  If one doesn't already exist
  a new window will be created.
  
+ =back
+ 
  The script "frameset.cgi" in the examples directory shows one way to
  create pages in which the fill-out form and the response live in
  side-by-side frames.
***************
*** 3111,3127 ****
  Glob types (e.g. text/*) in the browser's accept list
  are handled correctly.
  
! =item B<cookie()>
  
  Returns the HTTP_COOKIE variable, an HTTP extension
  implemented by Netscape browsers version 1.1
! and higher.  You can set this variable using the
! header() B<-cookie> parameter, and the browser will
! pass it back to your script on all subsequent
! transactions.  You can use it as a session ID or
! even store a small number of state variables in it.
! Don't count on getting a cookie back from other
! browsers.
  
  =item B<user_agent()>
  
--- 3477,3490 ----
  Glob types (e.g. text/*) in the browser's accept list
  are handled correctly.
  
! =item B<raw_cookie()>
  
  Returns the HTTP_COOKIE variable, an HTTP extension
  implemented by Netscape browsers version 1.1
! and higher.  Cookies have a special format, and this 
! method call just returns the raw form (?cookie dough).
! See cookie() for ways of setting and retrieving
! cooked cookies.
  
  =item B<user_agent()>
  
diff -cNr CGI-modules-2.75.orig/Makefile.PL CGI-modules-2.75/Makefile.PL
*** CGI-modules-2.75.orig/Makefile.PL	Thu Feb 15 02:56:17 1996
--- CGI-modules-2.75/Makefile.PL	Tue Apr 30 00:15:34 1996
***************
*** 1,7 ****
  use ExtUtils::MakeMaker;
  WriteMakefile(
  	NAME => "CGI",
! 	DISTNAME => "CGI-modules",
  	VERSION => "2.75",
          linkext => { LINKTYPE => '' },
          dist => {COMPRESS=>'gzip -9f', SUFFIX => 'gz'},
--- 1,7 ----
  use ExtUtils::MakeMaker;
  WriteMakefile(
  	NAME => "CGI",
! 	DISTNAME => "CGI_modules",
  	VERSION => "2.75",
          linkext => { LINKTYPE => '' },
          dist => {COMPRESS=>'gzip -9f', SUFFIX => 'gz'},
diff -cNr CGI-modules-2.75.orig/README.CGI CGI-modules-2.75/README.CGI
*** CGI-modules-2.75.orig/README.CGI	Sat Feb 24 17:09:28 1996
--- CGI-modules-2.75/README.CGI	Mon Apr 29 23:56:11 1996
***************
*** 1,4 ****
! This is CGI.pm 2.16, an easy-to-use Perl5 library for writing World
  Wide Web CGI scripts.
  
  To install this module, cd to the directory that contains this README
--- 1,4 ----
! This is CGI.pm 2.19, an easy-to-use Perl5 library for writing World
  Wide Web CGI scripts.
  
  To install this module, cd to the directory that contains this README
***************
*** 16,26 ****
  access privileges to add to the perl library directory, you can still
  use CGI.pm.  See the docs for details.
  
! People wishing to use the file upload features on Windows NT, 
! Windows 95, and VMS _servers_ should set the variable $binmode
! to 1 (see the docs for more details).  People using Macintosh
! servers are welcome to try this module, but I wasn't able to
! get it to work the last time I tried.
  
  The documentation for these modules is part of the CGI.pm itself.  It
  can be read using the pod2man and pod2html programs that come with
--- 16,24 ----
  access privileges to add to the perl library directory, you can still
  use CGI.pm.  See the docs for details.
  
! This module works with NT, Windows, Macintosh and VMS servers, although
! it hasn't been tested as extensively as it should be.  See the docs
! for notes on your particular platform.
  
  The documentation for these modules is part of the CGI.pm itself.  It
  can be read using the pod2man and pod2html programs that come with
diff -cNr CGI-modules-2.75.orig/debian.COPYRIGHT CGI-modules-2.75/debian.COPYRIGHT
*** CGI-modules-2.75.orig/debian.COPYRIGHT	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.COPYRIGHT	Fri May 24 00:58:37 1996
***************
*** 0 ****
--- 1,40 ----
+                            CGI-modules
+ 
+ This code is copyright 1995 by Lincoln Stein and the Whitehead
+ Institute for Biomedical Research.  All rights reserved.
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
+ 
+ IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT,
+ INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION (INCLUDING, BUT NOT
+ LIMITED TO, LOST PROFITS) EVEN IF THE AUTHORS HAVE BEEN ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ ------------------------------------------------------------------------
+ ------------------------------------------------------------------------
+ Parts of this package are Copyrighted under these terms:
+ ------------------------------------------------------------------------
+ Base.pm, MiniSvr.pm, Request.pm:
+ This code is Copyright (C) Tim Bunce 1995. All rights reserved.
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
+ 
+ This code includes ideas from the work of Steven E. Brenner
+ <S.E.Brenner@bioc.cam.ac.uk> (cgi-lib), Lincoln Stein
+ <lstein@genome.wi.mit.edu> (CGI.pm), Pratap Pereira
+ <pereira@ee.eng.ohio-state.edu> (phttpd), Jack Shirazi 
+ <js@biu.icnet.uk> and possibly others.
+ 
+ IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT,
+ INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION (INCLUDING, BUT NOT
+ LIMITED TO, LOST PROFITS) EVEN IF THE AUTHORS HAVE BEEN ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
+ ------------------------------------------------------------------------
+ The cgi-lib functions in Request.pm are based on cgi-lib.pl version 1.7
+ which is Copyright 1994 Steven E. Brenner.
+ ------------------------------------------------------------------------
+ 
+  The debian specific changes are Copyright (c) 1996 Manoj Srivastava, and 
+  distributed under the terms of the Artistic License.
diff -cNr CGI-modules-2.75.orig/debian.Changelog CGI-modules-2.75/debian.Changelog
*** CGI-modules-2.75.orig/debian.Changelog	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.Changelog	Fri May 24 01:01:51 1996
***************
*** 0 ****
--- 1,25 ----
+ 
+ Modifications to the CGI-modules-2.75 sources for debian linux
+ Changes by Manoj Srivastava <srivasta@pilgrim.umass.edu>
+ 
+ 	* Added debian.* files 
+         * Modified cgi_pm.html relative URLS for a debian system.
+ 
+ Changes for CGI-modules-2.75-1:
+         * Added the architecture field to the package file name.
+         * point to /usr/doc/copright/Artistic rather than install
+           our own copy.
+ 
+ Changes for CGI_modules-2.75-2
+         * changed the name of the package to CGI_modules from 
+           CGI-modules.
+         * Included a new version of CGI.pm, complete with manpages
+           and documentation. (I dislike merging CGI.pm into CGI_modules,
+           and were it not at the express request of the author, I would
+           split this package into two packages, since they seem to be 
+           upgraded on different schedules)
+ 
+ Changes for CGI_modules-2.75-3
+         * changed the name of the package to CGI-modules from 
+           CGI_modules.
+ 
diff -cNr CGI-modules-2.75.orig/debian.README CGI-modules-2.75/debian.README
*** CGI-modules-2.75.orig/debian.README	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.README	Fri May 24 00:59:18 1996
***************
*** 0 ****
--- 1,15 ----
+ This is Debian Linux's prepackaged version of Lincoln D. Stein's
+ CGI modules.
+ 
+ This version was put together by Manoj Srivastava <srivasta@pilgrim.umass.edu>,
+ from the sources distributed directly by the author, Lincoln D. Stein
+ lstein@genome.wi.mit.edu
+ 
+ At the request of the Author, two different upstreams packages are being 
+ merged together into a single debian package (CGI.pm is usually distributed 
+ separately).
+ 
+ The changes in this package are essentially the addition of support for 
+ the Debian package maintenance scheme, by adding various debian.* files, 
+ merging the manifests, and moving cgi_docs.html to doc/cgi_pm.html, and
+ fixing hrefs in that file.
diff -cNr CGI-modules-2.75.orig/debian.changes CGI-modules-2.75/debian.changes
*** CGI-modules-2.75.orig/debian.changes	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.changes	Fri May 24 01:01:16 1996
***************
*** 0 ****
--- 1,3 ----
+         * changed the name of the package to CGI-modules from 
+           CGI_modules.
+ 
diff -cNr CGI-modules-2.75.orig/debian.control CGI-modules-2.75/debian.control
*** CGI-modules-2.75.orig/debian.control	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.control	Fri May 24 01:05:26 1996
***************
*** 0 ****
--- 1,23 ----
+ PACKAGE: =P
+ VERSION: =V
+ ARCHITECTURE: =A
+ DEPENDS: perl
+ SUGGESTS: libwww-perl
+ CONFLICTS: CGI_modules
+ REPLACES: CGI_modules
+ SECTION: devel
+ PRIORITY: extra
+ MAINTAINER: Manoj Srivastava <srivasta@pilgrim.umass.edu>
+ DESCRIPTION: modules for perl5, for use in writing CGI scripts.
+  In addition to this package, you will also need the URI::Unescape
+  class, which is part of the libwww-perl package.
+  .
+  This perl 5 library uses objects to create Web fill-out forms on the
+  fly and to parse their contents. It provides a simple interface for
+  parsing and interpreting query strings passed to CGI scripts.
+  However, it also offers a rich set of functions for creating fill-out
+  forms. Instead of remembering the syntax for HTML form elements, you
+  just make a series of perl function calls. An important fringe benefit
+  of this is that the value of the previous query is used to initialize
+  the form, so that the state of the form is preserved from invocation
+  to invocation.
diff -cNr CGI-modules-2.75.orig/debian.rules CGI-modules-2.75/debian.rules
*** CGI-modules-2.75.orig/debian.rules	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/debian.rules	Fri May 24 01:00:45 1996
***************
*** 0 ****
--- 1,167 ----
+ #! /usr/bin/make -f
+ #
+ # To make the binary distribution package, the ``Debianized'' source package
+ # and the context diff to the original package, type `./debian.rules dist'.
+ # Make sure that `debian.rules' is executable before the final distribution
+ # is made.
+ #
+ # Invoke each target with `./debian.rules <target>'.  All targets should be
+ # invoked with the package root as the current directory.
+ #
+ # The `binary' target must be run as root, as it needs to install files with
+ # specific ownerships.	The `diff' target assumes that you have the original
+ # source package available, unpacked, in ../$(package)-$(version).orig, or 
+ # that you have the previous revision of the ``Debianized'' source package
+ # and context diff in the parent directory.
+ #
+ 
+ # The name of the package (for example, `emacs').
+ package = CGI-modules
+ # The version of the package (for example, `19.28').
+ version = 2.75
+ # The Debian revision of the package (for example, `2').
+ debian = 3
+ priority = Low
+ # The default architecture (all if architecture independent)
+ architecture=all
+ # separators (not used yet)
+ sep1 = -
+ sep2 = .
+ sep3 = .
+ 
+ # The maintainer information.
+ maintainer = Manoj Srivastava
+ email= srivasta@pilgrim.umass.edu
+ 
+ FILES_TO_CLEAN = stamp-configure stamp-build 
+ DIRS_TO_CLEAN  = debian-tmp
+ thisdir=$(shell pwd)
+ 
+ build:
+ # Builds the binary package.
+ # .config is kept so people are not startled by a spurious mail message. 
+ 	-test ! -f stamp-configure && \
+ 	    /bin/perl Makefile.PL && touch stamp-configure
+ 	make 
+ 	touch stamp-build
+ 
+ clean:
+ # Undoes the effect of `make -f debian.rules build'.
+ 	rm -f  $(FILES_TO_CLEAN)
+ 	rm -rf $(DIRS_TO_CLEAN)
+ 	-test -f Makefile && make realclean
+ 
+ binary: checkroot 
+ # Makes a binary package.
+ 	test -f stamp-build || make -f debian.rules build
+ 	rm -rf debian-tmp
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root debian-tmp
+ 	chmod g-s debian-tmp
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root \
+ 		    debian-tmp/usr/lib/perl5/i486-linux/5.002
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root debian-tmp/usr/man/man3
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root debian-tmp/usr/doc/copyright
+ 	/usr/bin/install -g root -m 644 -o root debian.COPYRIGHT \
+ 	     debian-tmp/usr/doc/copyright/$(package)
+ 	ln -s /usr/doc/copyright/Artistic \
+ 	     debian-tmp/usr/doc/copyright/$(package).Artistic
+ 	chown root.root debian-tmp/usr/doc/copyright/$(package).Artistic
+ 	chmod 644 debian-tmp/usr/doc/copyright/$(package).Artistic
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root debian-tmp/DEBIAN
+ 	sed -e 's/VERSION:.*=V/VERSION: $(version)-$(debian)/' \
+ 	    -e 's/ARCHITECTURE:.*=A/ARCHITECTURE: $(architecture)/' \
+             -e 's/PACKAGE:.*=P/PACKAGE: $(package)/g' \
+ 	    <debian.control >debian-tmp/DEBIAN/control
+ 	chmod 644 debian-tmp/DEBIAN/control
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root \
+ 	     debian-tmp/usr/doc/$(package)
+ 	/usr/bin/install -g root -m 644 -o root README \
+ 	     debian-tmp/usr/doc/$(package)/README
+ 	gzip -9 debian-tmp/usr/doc/$(package)/README
+ 	/usr/bin/install -g root -m 644 -o root README.CGI \
+ 	     debian-tmp/usr/doc/$(package)/README.CGI
+ 	gzip -9 debian-tmp/usr/doc/$(package)/README.CGI
+ 	/usr/bin/install -g root -m 644 -o root debian.README \
+ 	     debian-tmp/usr/doc/$(package)/README.debian
+ 	gzip -9 debian-tmp/usr/doc/$(package)/README.debian
+ 	/usr/bin/install -g root -m 644 -o root doc/* \
+ 	     debian-tmp/usr/doc/$(package)/
+ 	#
+ 	/usr/bin/install -d -g root -m 755 -o root \
+ 	     debian-tmp/usr/doc/examples/$(package)
+ 	for i in examples/*;\
+ 	do\
+ 	       install -g root -m 644 -o root \
+ 		  $$i debian-tmp/usr/doc/examples/$(package)/`basename $$i`;\
+ 	done;
+ 	for i in debian-tmp/usr/doc/examples/$(package)/*.txt;\
+ 	do\
+ 	       gzip -9f $$i;\
+ 	done;
+ 	#
+ 	make INSTALLDIRS=perl PREFIX=$(thisdir)/debian-tmp/usr install
+ 	chmod -R u+w debian-tmp/usr/
+ 	rm debian-tmp/usr/lib/perl5/i486-linux/5.002/perllocal.pod
+ 	dpkg --build debian-tmp
+ 	mv debian-tmp.deb ../$(package)-$(version)-$(debian).$(architecture).deb
+ 
+ source: clean
+ # Makes a source package.
+ 	-test -f stamp-build && make -f debian.rules clean
+ 	( cd .. && tar cf - $(package)-$(version) | gzip -9f > \
+ 			$(package)-$(version)-$(debian).tar.gz )
+ 
+ diff: clean
+ # Makes a context diff.
+ 	-test -f stamp-build && make -f debian.rules clean
+ 	-test -d ../$(package)-$(version).orig -o \
+ 	      -f ../$(package)-$(version)-`expr $(debian) - 1`.diff.gz \
+ 	  || ( echo "Original source package is not available." ; false )
+ 	-test -d ../$(package)-$(version).orig || make -f debian.rules orig
+ 	( cd .. && diff -cNr $(package)-$(version).orig \
+ 			     $(package)-$(version) | gzip -9f \
+ 	  > $(package)-$(version)-$(debian).diff.gz )
+ 	-test -f stamp-orig \
+ 	  && rm -rf ../$(package)-$(version).orig && rm -f stamp-orig
+ 
+ dist: binary source diff
+ # Prepares the package for distribution.
+ 	-(cd .. && \
+ 	 /usr/bin/dchanges -n ce=$(package)-$(version)/debian.changes \
+ 	    arch="$(architecture)" \
+ 	    pgp="$(maintainer)" \
+ 	    pri="$(priority)" \
+ 	    $(package)-$(version)-$(debian).$(architecture).deb \
+ 	    $(package)-$(version)-$(debian).diff.gz \
+ 	    $(package)-$(version)-$(debian).tar.gz )
+ 
+ orig:
+ # Prepares the original package from the previous
+ # Debian revision source package and context diff.
+ 	( cd .. \
+ 	  && mkdir $(package).orig \
+ 	  && cd $(package).orig \
+ 	  && tar xzf ../$(package)-$(version)-`expr $(debian) - 1`.tar.gz \
+ 	  && ( zcat ../../$(package)-$(version)-`expr $(debian) - 1`.diff.gz \
+ 	    | grep ^diff | cut -d' ' -f4 | xargs touch ) \
+ 	  && cd $(package)-$(version) \
+ 	  && ( zcat ../../$(package)-$(version)-`expr $(debian) - 1`.diff.gz \
+ 	    | patch -sER -p1 ) \
+ 	  && find . -name "*.orig" -exec rm -f {} \; \
+ 	  && cd .. \
+ 	  && mv $(package)-$(version) ../$(package)-$(version).orig \
+ 	  && cd .. \
+ 	  && rmdir $(package).orig )
+ 	touch stamp-orig
+ 
+ checkroot:
+ 	test root = "`whoami`"
+ 
+ .PHONY: binary source diff clean checkroot
+ 
diff -cNr CGI-modules-2.75.orig/doc/cgi_pm.html CGI-modules-2.75/doc/cgi_pm.html
*** CGI-modules-2.75.orig/doc/cgi_pm.html	Tue Apr  2 23:54:50 1996
--- CGI-modules-2.75/doc/cgi_pm.html	Mon Apr 29 23:51:33 1996
***************
*** 3,11 ****
  </HEAD>
  
  <BODY>
! <H1><IMG SRC="examples/dna.small.gif" ALT="[logo]">
  CGI.pm - a Perl5 CGI Library</H1>
! Version 2.18, 3/30/96, L. Stein
  <p>
  Mirrors of this document may be found at:
  <ul>
--- 3,11 ----
  </HEAD>
  
  <BODY>
! <H1><IMG SRC="../examples/CGI_modules/dna.small.gif" ALT="[logo]">
  CGI.pm - a Perl5 CGI Library</H1>
! Version 2.19, 4/22/96, L. Stein
  <p>
  Mirrors of this document may be found at:
  <ul>
***************
*** 76,83 ****
  }
  </PRE>
  
! <A HREF="examples/tryit.cgi">Select this link to try the script</A>
! <BR><A HREF="examples/">More scripting examples</A>
  
  <A NAME="contents">
  <H2>Contents</H2>
--- 76,83 ----
  }
  </PRE>
  
! <A HREF="../examples/CGI_modules/tryit.cgi">Select this link to try the script</A>
! <BR><A HREF="../examples/CGI_modules/">More scripting examples</A>
  
  <A NAME="contents">
  <H2>Contents</H2>
***************
*** 92,106 ****
    <LI><A HREF="#forms">Creating forms</A>
    <LI><A HREF="#debugging">Debugging</A>
    <LI><A HREF="#environment">HTTP session variables</A>
    <li><a href="#frames">Support for Netscape frames</a>
    <li><a href="#javascripting">Support for JavaScript</a>
    <LI><A HREF="#advanced">Advanced techniques</A>
    <LI><a href="#SelfLoader">CGI.pm and the SelfLoader module</a>
    <LI><a href="#upload_caveats">Using the File Upload Feature</a>
    <LI><A HREF="#non_unix">Using CGI.pm on non-Unix Platforms</A>
    <LI><A HREF="#future">Future prospects</A>
    <LI><A HREF="#distribution">Distribution information</A>
!   <LI><A HREF="#new">What's new in version 2.18?</A>
  </MENU>
  
  <HR>
--- 92,108 ----
    <LI><A HREF="#forms">Creating forms</A>
    <LI><A HREF="#debugging">Debugging</A>
    <LI><A HREF="#environment">HTTP session variables</A>
+   <LI><A HREF="#cookies">Netscape Cookies</A>
    <li><a href="#frames">Support for Netscape frames</a>
    <li><a href="#javascripting">Support for JavaScript</a>
    <LI><A HREF="#advanced">Advanced techniques</A>
+   <LI><A HREF="#migrating">Migrating from cgi-lib.pl</A>
    <LI><a href="#SelfLoader">CGI.pm and the SelfLoader module</a>
    <LI><a href="#upload_caveats">Using the File Upload Feature</a>
    <LI><A HREF="#non_unix">Using CGI.pm on non-Unix Platforms</A>
    <LI><A HREF="#future">Future prospects</A>
    <LI><A HREF="#distribution">Distribution information</A>
!   <LI><A HREF="#new">What's new in version 2.19?</A>
  </MENU>
  
  <HR>
***************
*** 428,469 ****
  processing but doesn't need to display any results, or for a script
  called when a user clicks on an empty part of a clickable image map.)
  <P>
! You can add any number of HTTP headers, including ones that aren't
! implemented, using named parameters:
  <PRE>
     print $query-&gt;header(-type=&gt;'image/gif',
                          -status=&gt;'402 Payment Required',
                          -Cost=&gt;'$0.02');
  </PRE>
! <h4><a name="set-cookie">Magic cookies</a></h4>
! Netscape 1.1 and higher supports a "magic cookie"
! HTTP header.  This cookie is a piece of text that the browser sends
! to the server during each request to your script.  Your script can
! set the cookie to whatever you like the first time it gets called,
! and retrieve it on later invocations.  This allows you to track
! a particular browser;  you can even store parameters in the
! cookie if you want to.
! <p>
! To set a browser cookie, call <code>header</code> with the
! <code>-cookie</code> parameter:
  <pre>
!    print $query-&gt;header(-cookie=&gt;'chocolate chip #3');
  </pre>
! Later you can retrieve it using the <a href="#cookie">cookie()</a>
! method.  The idiom for creating a cookie if it doesn't already
! exist looks like this:
  <pre>
!    $cookie = $query-&gt;cookie();
!    if (!$cookie) {
!       $cookie = generate_some_random_cookie();
!    }
!    print $query-&gt;header(-cookie=&gt;$cookie);
  </pre>
! This technique will <em>not</em> work with non-Netscape browsers.
! You should also be warned that certain servers, such as Apache 1.0 and
! the Netscape servers, will attempt to generate magic cookies for you.
! You should be alert for any adverse interaction between your script
! and the server.
  
  <A NAME="redirect">
  <H3>Creating the Header for a Redirection Request</H3>
--- 430,490 ----
  processing but doesn't need to display any results, or for a script
  called when a user clicks on an empty part of a clickable image map.)
  <P>
! Several other named parameters are recognized.  Here's a
! contrived example that uses them all:
! 
  <PRE>
     print $query-&gt;header(-type=&gt;'image/gif',
                          -status=&gt;'402 Payment Required',
+                         -expires=&gt;'+3d',
+                         -cookie=&gt;$my_cookie,
                          -Cost=&gt;'$0.02');
  </PRE>
! 
! <h4>-expires</h4>
! 
! Most browsers will not cache the output of CGI scripts.  Every time
! the browser reloads the page, the script is invoked again.  You can
! change this behavior with the <strong>-expires</strong> parameter.
! When you specify an absolute or relative expiration interval with this
! parameter, some browsers and proxy servers will cache the script's
! output until the indicated expiration date.  The following forms are
! all valid for the <strong>-expires</strong> field:
  <pre>
! 	+30s                              30 seconds from now
! 	+10m                              ten minutes from now
! 	+1h	                          one hour from now
!         -1d                               yesterday (i.e. "ASAP!")
! 	now                               immediately
! 	+3M                               in three months
!         +10y                              in ten years time
! 	Thursday, 25-Apr-96 00:40:33 GMT  at the indicated time & date
  </pre>
! <p>
! <strong>CGI::expires()</strong> is the static function call used internally that turns
! relative time intervals into HTTP dates.  You can call it directly if
! you wish.
! 
! <h4>-cookie</h4>
! 
! The <strong>-cookie</strong> parameter generates a header that tells
! Netscape browsers to return a "magic cookie" during all subsequent
! transactions with your script.  Netscape cookies have a special format
! that includes interesting attributes such as expiration time.  Use the
! <a name="#cookies">cookie()</a> method to create and retrieve session cookies.
! 
! <h4>Other header fields</h4>
! 
! Any other parameters that you pass to <strong>header()</strong> will be turned
! into correctly formatted HTTP header fields, even if they aren't called for
! in the current HTTP spec.  For example, the example that appears a few paragraphs
! above creates a field that looks like this:
  <pre>
!    Cost: $0.02
  </pre>
! 
! You can use this to take advantage of new HTTP header fields without
! waiting for the next release of CGI.pm.
  
  <A NAME="redirect">
  <H3>Creating the Header for a Redirection Request</H3>
***************
*** 563,569 ****
    <LI>Any additional attributes you want to incorporate into the &lt;BODY&gt;
         tag (as many as you like).  This is a good way to incorporate other
        Netscape extensions, such as background color and wallpaper pattern.
!       (The example above sets the page background to a vibrant blue.)
  </UL>
  
  <H3>Ending an HTML Document</H3>
--- 584,593 ----
    <LI>Any additional attributes you want to incorporate into the &lt;BODY&gt;
         tag (as many as you like).  This is a good way to incorporate other
        Netscape extensions, such as background color and wallpaper pattern.
!       (The example above sets the page background to a vibrant blue.)  You can
!       use this feature to take advantage of new HTML features without
! waiting for a CGI.pm
!       release.
  </UL>
  
  <H3>Ending an HTML Document</H3>
***************
*** 1331,1337 ****
         <STRONG>-default</STRONG> and an array reference here.
  </UL>
  <STRONG><A NAME="hidden_fields_warning">
! <IMG SRC="examples/caution.xbm" ALT="[CAUTION]">
  As of version 2.0 I have changed the behavior of hidden fields
  once again.  Read this if you use hidden fields.</A></STRONG>
  <P>
--- 1355,1361 ----
         <STRONG>-default</STRONG> and an array reference here.
  </UL>
  <STRONG><A NAME="hidden_fields_warning">
! <IMG SRC="../examples/CGI_modules/caution.xbm" ALT="[CAUTION]">
  As of version 2.0 I have changed the behavior of hidden fields
  once again.  Read this if you use hidden fields.</A></STRONG>
  <P>
***************
*** 1539,1549 ****
         are handled correctly.
    <DT>auth_type()
    <DD>Return the authorization type, if protection is active.  Example "Basic".
!   <DT><a name="cookie">cookie()</a>
!   <DD>Returns the "magic cookie" maintained by Netscape 1.1 and higher.
!       In conjunction with the <code>header()<a href="#set-cookie">-cookie</a></code>
!       parameter, this can be used to keep track of a particular browser.  This
!       will <em>not</em> work with non-Netscape browsers.
    <DT>path_info() 
    <DD>Returns additional path information from the script URL.
         E.G. fetching <CODE>/cgi-bin/your_script/additional/stuff</CODE> will
--- 1563,1572 ----
         are handled correctly.
    <DT>auth_type()
    <DD>Return the authorization type, if protection is active.  Example "Basic".
!   <DT><a name="raw_cookie">raw_cookie()</a>
!   <DD>Returns the "magic cookie" maintained by Netscape 1.1 and higher in a raw
!       state.  You'll probably want to use <a href="cookies">cookie()</a> instead,
!       which gives you a high-level interface to the cookie functions.
    <DT>path_info() 
    <DD>Returns additional path information from the script URL.
         E.G. fetching <CODE>/cgi-bin/your_script/additional/stuff</CODE> will
***************
*** 1553,1558 ****
--- 1576,1583 ----
    <DD>As per path_info() but returns the additional
         path information translated into a physical path, e.g.
         <CODE>"/usr/local/etc/httpd/htdocs/additional/stuff"</CODE>.
+   <DT>query_string()  
+   <DD>Returns a query string suitable for maintaining state.
    <DT>referer()
    <DD>Return the URL of the page the browser was viewing
         prior to fetching your script.  Not available for all
***************
*** 1589,1594 ****
--- 1614,1753 ----
  <A HREF="#contents">Table of contents</A>
  
  <HR>
+ <A NAME="cookies">
+ <H2>Netscape Cookies</H2>
+ </A>
+ 
+ Netscape browsers versions 1.1 and higher support a so-called
+ "cookie" designed to help maintain state within a browser session.
+ CGI.pm has several methods that support cookies.
+ 
+ <p>
+ 
+ A cookie is a name=value pair much like the named parameters in a CGI
+ query string.  CGI scripts create one or more cookies and send
+ them to the browser in the HTTP header.  The browser maintains a list
+ of cookies that belong to a particular Web server, and returns them
+ to the CGI script during subsequent interactions.
+ 
+ <p>
+ 
+ In addition to the required name=value pair, each cookie has several
+ optional attributes:
+ 
+ <dl>
+   <dt>an expiration time
+   <dd>This is a time/date string (in a special GMT format) that indicates
+       when a cookie expires.  The cookie will be saved and returned to your
+       script until this expiration date is reached if the user exits
+       Netscape and restarts it.  If an expiration date isn't specified, the cookie
+       will remain active until the user quits Netscape.<p>
+   <dt>a domain
+   <dd>This is a partial or complete domain name for which the cookie is 
+       valid.  The browser will return the cookie to any host that matches
+       the partial domain name.  For example, if you specify a domain name
+       of ".capricorn.com", then Netscape will return the cookie to
+       Web servers running on any of the machines "www.capricorn.com", 
+       "www2.capricorn.com", "feckless.capricorn.com", etc.  Domain names
+       must contain at least two periods to prevent attempts to match
+       on top level domains like ".edu".  If no domain is specified, then
+       the browser will only return the cookie to servers on the host the
+       cookie originated from.<p>
+   <dt>a path
+   <dd>If you provide a cookie path attribute, the browser will check it
+       against your script's URL before returning the cookie.  For example,
+       if you specify the path "/cgi-bin", then the cookie will be returned
+       to each of the scripts "/cgi-bin/tally.pl", "/cgi-bin/order.pl",
+       and "/cgi-bin/customer_service/complain.pl", but not to the script
+       "/cgi-private/site_admin.pl".  By default, path is set to "/", which
+       causes the cookie to be sent to any CGI script on your site.
+   <dt>a "secure" flag
+   <dd>If the "secure" attribute is set, the cookie will only be sent to your
+       script if the CGI request is occurring on a secure channel, such as SSL.
+ </dl>
+ 
+ The interface to Netscape cookies is the <strong>cookie()</strong> method:
+ <pre>
+     $cookie = $query-&gt;cookie(-name=&gt;'sessionID',
+ 			     -value=&gt;'xyzzy',
+ 			     -expires=&gt;'+1h',
+ 			     -path=&gt;'/cgi-bin/database',
+ 			     -domain=&gt;'.capricorn.org',
+ 			     -secure=&gt;1);
+     print $query-&gt;header(-cookie=&gt;$cookie);
+ </pre>
+ 
+ <strong>cookie()</strong> creates a new cookie.  Its parameters include:
+ 
+ <dl>
+   <dt><strong>-name</strong>
+   <dd>The name of the cookie (required).  This can be any string at all.
+       Although Netscape limits its cookie names to non-whitespace
+       alphanumeric characters, CGI.pm removes this restriction by escaping
+       and unescaping cookies behind the scenes.<p>
+   <dt><strong>-value</strong>
+   <dd>The value of the cookie.  This can be any scalar value,
+       array reference, or even associative array reference.  For example,
+       you can store an entire associative array into a cookie this way:
+ <pre>
+ 	$cookie=$query-&gt;cookie(-name=&gt;'family information',
+                                -value=&gt;\%childrens_ages);
+ </pre>
+       
+   <dt><strong>-path</strong>
+   <dd>The optional partial path for which this cookie will be valid, as described
+       above.<p>
+   <dt><strong>-domain</strong>
+   <dd>The optional partial domain for which this cookie will be valid, as described
+       above.
+   <dt><strong>-expires</strong>
+   <dd>The optional expiration date for this cookie.  The format is as described 
+       in the section on the B<header()> method:
+       <pre>
+ 	"+1h"  one hour from now
+       </pre>
+   <dt><strong>-secure</strong>
+   <dd>If set to true, this cookie will only be used within a secure
+       SSL session.
+ </dl>
+ 
+ The cookie created by cookie() must be incorporated into the HTTP
+ header within the string returned by the <a href="#header">header()</a> method:
+ <pre>
+ 	print $query-&gt;header(-cookie=&gt;$my_cookie);
+ </pre>
+ To create multiple cookies, give header() an array reference:
+ <pre>
+ 	$cookie1 = $query-&gt;cookie(-name=&gt;'riddle_name',
+                                   -value=&gt;"The Sphynx's Question");
+         $cookie2 = $query-&gt;cookie(-name=&gt;'answers',
+                                   -value=&gt;\%answers);
+         print $query-&gt;header(-cookie=&gt;[$cookie1,$cookie2]);
+ </pre>
+ To retrieve a cookie, request it by name by calling cookie()
+ method without the <strong>-value</strong> parameter:
+ <pre>
+ 	use CGI;
+ 	$query = new CGI;
+ 	%answers = $query-&gt;cookie('answers');
+ 	# $query-&gt;cookie(-name=&gt;'answers') works too!
+ </pre>
+ See the <a href="../examples/CGI_modules/cookie.cgi">cookie.cgi</a> example script
+ for some ideas on how to use cookies effectively.
+ <p>
+ 
+ <strong>NOTE:</strong> There appear to be some (undocumented)
+ restrictions on Netscape cookies.  In Netscape 2.01, at least, I
+ haven't been able to set more than three cookies at a time.  There may
+ also be limits on the length of cookies.  If you need to store a lot
+ of information, it's probably better to create a unique session ID,
+ store it in a cookie, and use the session ID to locate an external
+ file/database saved on the server's side of the connection.
+ <p>
+ <A HREF="#contents">Table of contents</A>
+ 
+ <HR>
+ 
  <A NAME="frames">
  <H2>Support for Netscape Frames</H2>
  </A>
***************
*** 1621,1629 ****
  frame.  The third section is responsible for creating the response and directing
  it into a different frame.
  <p>
! <a href="examples/">The examples directory</a> contains a script called
! <a href="examples/popup.cgi">popup.cgi</a> that demonstrates a simple
! popup window.  <a href="examples/frameset.cgi">frameset.cgi</a> provides
  a skeleton script for creating side-by-side query/result frame sets.
  <HR>
  
--- 1780,1788 ----
  frame.  The third section is responsible for creating the response and directing
  it into a different frame.
  <p>
! <a href="../examples/CGI_modules/">The examples directory</a> contains a script called
! <a href="../examples/CGI_modules/popup.cgi">popup.cgi</a> that demonstrates a simple
! popup window.  <a href="../examples/CGI_modules/frameset.cgi">frameset.cgi</a> provides
  a skeleton script for creating side-by-side query/result frame sets.
  <HR>
  
***************
*** 1746,1752 ****
  <pre>
     print $q-&gt;startform(-onSubmit=&gt;"validateMe(this)");
  </pre>
! See the <a href="examples/javascript.cgi">javascript.cgi</a> script for a
  demonstration of how this all works.
  <p>
  <a href="#contents">Table of contents</a>
--- 1905,1911 ----
  <pre>
     print $q-&gt;startform(-onSubmit=&gt;"validateMe(this)");
  </pre>
! See the <a href="../examples/CGI_modules/javascript.cgi">javascript.cgi</a> script for a
  demonstration of how this all works.
  <p>
  <a href="#contents">Table of contents</a>
***************
*** 1903,1908 ****
--- 2062,2131 ----
  print "&lt;HR&gt;\n";
  print $query-&gt;end_html;
  </PRE>
+ <p>
+ <A HREF="#contents">Table of contents</A>
+ <HR>
+ 
+ <H2><a name="migrating">Migrating from cgi-lib.pl</a></H2>
+ 
+ To make it easier to convert older scripts that use cgi-lib.pl,
+ CGI.pm provides a <strong>CGI::ReadParse()</strong> call that
+ is compatible with cgi-lib.pl's <strong>&ReadParse</strong>
+ subroutine.
+ <p>
+ 
+ When you call ReadParse(), CGI.pm creates an associative array
+ named <code>%in</code> that contains the named CGI
+ parameters.  Multi-valued parameters are separated by "\0"
+ characters in exactly the same way cgi-lib.pl does it.  To
+ port an old script to CGI.pm, you have to make just two changes:
+ 
+ <h4>Old Script</h4>
+ <pre>
+     require "cgi-lib.pl";
+     &ReadParse;
+     print "The value of the antique is $in{antique}.\n";
+ </pre>
+ 
+ <h4>New Script</h4>
+ <pre>
+     use CGI;
+     CGI::ReadParse;
+     print "The value of the antique is $in{antique}.\n";
+ </pre>
+ 
+ Like cgi-lib's ReadParse, pass a variable <em>glob</em> in
+ order to use a different variable than the default "%in":
+ <pre>
+    CGI::ReadParse(%Q);
+    @partners = split("\0",$Q{'golf_partners'});
+ </pre>
+ 
+ <p>
+ The associative array created by CGI::ReadParse() contains
+ a special key 'CGI', which returns the CGI query object
+ itself:
+ <pre>
+     CGI::ReadParse;
+     $q = $in{CGI};
+     print $q-&gt;textfield(-name=&gt;'wow',
+                         -value=&gt;'does this really work?');
+ </pre>
+ <p>
+ 
+ This allows you to add the more interesting features
+ of CGI.pm to your old scripts without rewriting them completely.
+ As an added benefit, the <strong>%in</strong> variable is
+ actually <code>tie()</code>'d to the CGI object.  Changing the
+ CGI object using <strong>param()</strong> will dynamically
+ change <strong>%in</strong>, and vice-versa.
+ 
+ <p>
+ 
+ cgi-lib.pl's <code>@in</code> and <code>$in</code> variables are
+ <strong>not</strong> supported.  File upload via these compatability
+ routines may work, but has not been tested.
+ 
  <HR>
  
  <H2><a name="SelfLoader">CGI.pm and the Self Loader</a></H2>
***************
*** 2071,2125 ****
  
  <H3><A NAME="non_unix">Using CGI.pm on non-Unix Platforms</A></H3>
  
! <H4>Windows NT</H4>
! The NT port of perl has an annoying habit of transforming newline (\n)
! sequences into carriage-return/newline (\r\n) sequences both on
! input and output.  This confuses certain servers, such as the
! Netscape Communications Server.  To make things work correctly,
! find the following line in CGI.pm
! <pre>
!    $needs_binmode = 0;
! </pre>
! and change it to
  <pre>
!    $needs_binmode = 1;
  </pre>
  
! CGI.pm works well with WebSite, the EMWACS server and Purveyor.
! CGI.pm must be put in the perl5 library directory,
! and all CGI scripts that use it should be placed in cgi-bin directory.
! You also need to associate the <CODE>.pl</CODE> suffix with perl5 using the NT
! file manager.
  <p>
  WebSite uses a slightly different cgi-bin directory structure than
  the standard.  For this server, place the scripts in the
! <CODE>cgi-shl</CODE> directory.
  <p>
! The Netscape Communications Server has terrible problems with Perl
! scripts because it doesn't use the standard NT file extension
! associations.  Netscape's recommendation of placing <code>perl.exe</code>
! in cgi-bin is a terrible mistake because it opens up a huge secure hole.
! <strong>Don't do it!</strong>  It's also a mistake to place <code>.bat</code>
! files in cgi-bin because of another security hole in the server.  You're
! safest running Visual Basic or C programs in cgi-bin if you use the
! Netscape Server.
  
  <H4>VMS</H4>
! Set $needs_binmode to 1 as described above.
  
  <H4>Macintosh</H4>
! Christian Huldt reports that at least the basic features of CGI.pm work
! correctly with MacPerl version 5.0.6r1 and
! the WebStar and MacHTTP servers.  The following changes have to be made:
! <ol>
!   <li>Replace <code>$CRLF="\r\n"</code> with <code>$CRLF="\015\012"</code>.
!       This has to do with MacPerl's rather liberal interpretation of the
!       meaning of the \r and \n escapes!  (NOTE: This has already been done
!       for you in version 2.18).
!   <li>Use '-value' instead of -value in the parameter lists.
! </ol>
  
  <HR>
  <A NAME="future">
  <H2>Future Prospects for this Library</H2>
  </A>
--- 2294,2364 ----
  
  <H3><A NAME="non_unix">Using CGI.pm on non-Unix Platforms</A></H3>
  
! I don't have access to all the combinations of hardware and software
! that I really need to make sure that CGI.pm works consistently for all
! Web servers, so I rely heavily on helpful reports from users like
! yourself.
! 
! <p>
! 
! There are a number of differences in file name and text processing
! conventions on different platforms.  By default, CGI.pm is set up
! to work properly on a Unix (or Linux) system.  To run it in other
! operating systems find the section of code near the top that looks
! like this:
  <pre>
!    # CHANGE THIS VARIABLE FOR YOUR OPERATING SYSTEM
!    $OS = 'UNIX';
!    # $OS = 'MACINTOSH';
!    # $OS = 'WINDOWS';
!    # $OS = 'NT';
!    # $OS = 'VMS';
  </pre>
  
! Comment out 'UNIX' and uncomment the line that's appropriate for your
! OS.  (WINDOWS is valid for both Windows 3.1 and Windows95).
! <p>
! 
! Other notes follow:
! 
! <H4>Windows NT</H4>
! 
! CGI.pm works well with WebSite, the EMWACS server, Purveyor and the
! Microsoft IIS server.  CGI.pm must be put in the perl5 library
! directory, and all CGI scripts that use it should be placed in cgi-bin
! directory.  You also need to associate the <CODE>.pl</CODE> suffix
! with perl5 using the NT file manager (Website, Purveyor), or install
! the Perl DLL library (IIS).
! 
  <p>
  WebSite uses a slightly different cgi-bin directory structure than
  the standard.  For this server, place the scripts in the
! <CODE>cgi-shl</CODE> directory.  CGI.pm appears to work correctly
! in both the Windows95 and WindowsNT versions of WebSite.
! 
! <p>
! Old Netscape Communications Server technical notes recommended
! placing <code>perl.exe</code> in cgi-bin.  This a very bad idea because
! it opens up a gaping security hole.  Put a C <code>.exe</code> wrapper
! around the perl script until such time as Netscape recognizes NT file
! manager associations, or provides a Perl-compatible DLL library for its
! servers.
! 
  <p>
! 
! If you have trouble with file uploads, make you ma
  
  <H4>VMS</H4>
! 
! I don't have access to a VMS machine, and I'm not sure whether file upload
! works correctly.  Other features are known to work.
  
  <H4>Macintosh</H4>
! CGI.pm works with MacPerl version 5.0.6r1 or higher under
! the WebStar and MacHTTP servers.
  
  <HR>
+ 
  <A NAME="future">
  <H2>Future Prospects for this Library</H2>
  </A>
***************
*** 2155,2171 ****
  You might also be interested in two packages for creating graphics
  on the fly:
  <DL>
!   <DT> <A HREF="GD.html">GD.html</A>
    <DD> A module for creating GIF images on the fly, using Tom Boutell's
!        <A HREF="http://siva.cshl.org/gd/gd.html">gd</A> graphics library.
!   <DT> <A HREF="../utilities/">qd.pl</A>
    <DD> A library for creating Macintosh PICT files on the fly (which
         can be converted to GIF or JPEG using NetPBM).
  </DL>
  <P>
  For a collection of CGI scripts of various levels of complexity,
  see the companion pages for my book
! <A HREF="http://www-genome.wi.mit.edu/WWW">How to Set Up and
  Maintain a World Wide Web Site</A>
  
  <HR>
--- 2394,2410 ----
  You might also be interested in two packages for creating graphics
  on the fly:
  <DL>
!   <DT> <A HREF="http://www.genome.wi.mit.edu/ftp/pub/software/WWW/GD.html">GD.html</A>
    <DD> A module for creating GIF images on the fly, using Tom Boutell's
!        <A HREF="http://www.boutell.com/gd/">gd</A> graphics library.
!   <DT> <A HREF="http://www.genome.wi.mit.edu/ftp/pub/software/utilities/">qd.pl</A>
    <DD> A library for creating Macintosh PICT files on the fly (which
         can be converted to GIF or JPEG using NetPBM).
  </DL>
  <P>
  For a collection of CGI scripts of various levels of complexity,
  see the companion pages for my book
! <A HREF="http://www-genome.wi.mit.edu/WWW/">How to Set Up and
  Maintain a World Wide Web Site</A>
  
  <HR>
***************
*** 2186,2191 ****
--- 2425,2439 ----
  
  <HR>
  <H2><A NAME="new">Revision History</A></H2>
+ <H3>Version 2.19</H3>
+ <ol>
+   <li>Added cookie() support routines.
+   <li>Added -expires parameter to header().
+   <li>Added cgi-lib.pl compatability mode.
+   <li>Made the module more configurable for different
+       operating systems.
+   <li>Fixed a dumb bug in JavaScript button() method.
+ </ol>
  <H3>Version 2.18</H3>
  <ol>
    <li>Fixed a bug that corrects a hang that
***************
*** 2440,2445 ****
  <a href="/">Whitehead Institute/MIT Center for Genome Research</a></ADDRESS>
  <P>
  <!-- hhmts start -->
! Last modified: Tue Apr  2 23:54:50 EST 1996
  <!-- hhmts end -->
  </BODY> </HTML>
--- 2688,2693 ----
  <a href="/">Whitehead Institute/MIT Center for Genome Research</a></ADDRESS>
  <P>
  <!-- hhmts start -->
! Last modified: Wed Apr 24 22:14:08 EDT 1996
  <!-- hhmts end -->
  </BODY> </HTML>
diff -cNr CGI-modules-2.75.orig/examples/cookie.cgi CGI-modules-2.75/examples/cookie.cgi
*** CGI-modules-2.75.orig/examples/cookie.cgi	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/examples/cookie.cgi	Mon Apr 29 23:45:16 1996
***************
*** 0 ****
--- 1,90 ----
+ #!/usr/local/bin/perl
+ 
+ use CGI;
+ use CGI::Carp;
+ $q = new CGI;
+ 
+ @ANIMALS=sort qw/lion tiger bear pig porcupine ferret zebra gnu ostrich
+     emu moa goat weasel yak chicken sheep hyena dodo lounge-lizard
+     squirrel rat mouse hedgehog racoon baboon kangaroo hippopotamus
+     giraffe/;
+ 
+ # Recover the previous animals from the magic cookie.
+ # The cookie has been formatted as an associative array
+ # mapping animal name to the number of animals.
+ %zoo = $q->cookie('animals');
+ 
+ # Recover the new animal(s) from the parameter 'new_animal'
+ @new = $q->param('new_animals');
+ 
+ # If the action is 'add', then add new animals to the zoo.  Otherwise
+ # delete them.
+ foreach (@new) {
+     if ($q->param('action') eq 'Add') {
+ 	$zoo{$_}++;
+     } elsif ($q->param('action') eq 'Delete') {
+ 	$zoo{$_}-- if $zoo{$_};
+ 	delete $zoo{$_} unless $zoo{$_};
+     }
+ }
+ 
+ # Add new animals to old, and put them in a cookie
+ $the_cookie = $q->cookie(-name=>'animals',
+ 			 -value=>\%zoo,
+ 			 -expires=>'+1h');
+ 
+ # Print the header, incorporating the cookie and the expiration date...
+ print $q->header(-cookie=>$the_cookie);
+ 
+ # Now we're ready to create our HTML page.
+ print $q->start_html('Animal crackers');
+ 
+ print <<EOF;
+ <h1>Animal Crackers</h1>
+ Choose the animals you want to add to the zoo, and click "add".
+ Come back to this page any time within the next hour and the list of 
+ animals in the zoo will be resurrected.  You can even quit Netscape
+ completely!
+ <p>
+ Try adding the same animal several times to the list.  Does this
+ remind you vaguely of a shopping cart?
+ <p>
+ <em>This script only works with Netscape browsers</em>
+ <p>
+ <center>
+ <table border>
+ <tr><th>Add/Delete<th>Current Contents
+ EOF
+     ;
+ 
+ print "<tr><td>",$q->start_form;
+ print $q->scrolling_list(-name=>'new_animals',
+ 			 -values=>[@ANIMALS],
+ 			 -multiple=>1,
+ 			 -override=>1,
+ 			 -size=>10),"<br>";
+ print $q->submit(-name=>'action',-value=>'Delete'),
+     $q->submit(-name=>'action',-value=>'Add');
+ print $q->end_form;
+ 
+ print "<td>";
+ if (%zoo) {			# make a table
+     print "<ul>\n";
+     foreach (sort keys %zoo) {
+ 	print "<li>$zoo{$_} $_\n";
+     }
+     print "</ul>\n";
+ } else {
+     print "<strong>The zoo is empty.</strong>\n";
+ }
+ print "</table></center>";
+ 
+ print <<EOF;
+ <hr>
+ <ADDRESS>Lincoln D. Stein</ADDRESS><BR>
+ <A HREF="./">More Examples</A>
+ EOF
+     ;
+ print $q->end_html;
+ 
+ 
diff -cNr CGI-modules-2.75.orig/examples/cookie.txt CGI-modules-2.75/examples/cookie.txt
*** CGI-modules-2.75.orig/examples/cookie.txt	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/examples/cookie.txt	Mon Apr 29 23:45:16 1996
***************
*** 0 ****
--- 1,90 ----
+ #!/usr/local/bin/perl
+ 
+ use CGI;
+ use CGI::Carp;
+ $q = new CGI;
+ 
+ @ANIMALS=sort qw/lion tiger bear pig porcupine ferret zebra gnu ostrich
+     emu moa goat weasel yak chicken sheep hyena dodo lounge-lizard
+     squirrel rat mouse hedgehog racoon baboon kangaroo hippopotamus
+     giraffe/;
+ 
+ # Recover the previous animals from the magic cookie.
+ # The cookie has been formatted as an associative array
+ # mapping animal name to the number of animals.
+ %zoo = $q->cookie('animals');
+ 
+ # Recover the new animal(s) from the parameter 'new_animal'
+ @new = $q->param('new_animals');
+ 
+ # If the action is 'add', then add new animals to the zoo.  Otherwise
+ # delete them.
+ foreach (@new) {
+     if ($q->param('action') eq 'Add') {
+ 	$zoo{$_}++;
+     } elsif ($q->param('action') eq 'Delete') {
+ 	$zoo{$_}-- if $zoo{$_};
+ 	delete $zoo{$_} unless $zoo{$_};
+     }
+ }
+ 
+ # Add new animals to old, and put them in a cookie
+ $the_cookie = $q->cookie(-name=>'animals',
+ 			 -value=>\%zoo,
+ 			 -expires=>'+1h');
+ 
+ # Print the header, incorporating the cookie and the expiration date...
+ print $q->header(-cookie=>$the_cookie);
+ 
+ # Now we're ready to create our HTML page.
+ print $q->start_html('Animal crackers');
+ 
+ print <<EOF;
+ <h1>Animal Crackers</h1>
+ Choose the animals you want to add to the zoo, and click "add".
+ Come back to this page any time within the next hour and the list of 
+ animals in the zoo will be resurrected.  You can even quit Netscape
+ completely!
+ <p>
+ Try adding the same animal several times to the list.  Does this
+ remind you vaguely of a shopping cart?
+ <p>
+ <em>This script only works with Netscape browsers</em>
+ <p>
+ <center>
+ <table border>
+ <tr><th>Add/Delete<th>Current Contents
+ EOF
+     ;
+ 
+ print "<tr><td>",$q->start_form;
+ print $q->scrolling_list(-name=>'new_animals',
+ 			 -values=>[@ANIMALS],
+ 			 -multiple=>1,
+ 			 -override=>1,
+ 			 -size=>10),"<br>";
+ print $q->submit(-name=>'action',-value=>'Delete'),
+     $q->submit(-name=>'action',-value=>'Add');
+ print $q->end_form;
+ 
+ print "<td>";
+ if (%zoo) {			# make a table
+     print "<ul>\n";
+     foreach (sort keys %zoo) {
+ 	print "<li>$zoo{$_} $_\n";
+     }
+     print "</ul>\n";
+ } else {
+     print "<strong>The zoo is empty.</strong>\n";
+ }
+ print "</table></center>";
+ 
+ print <<EOF;
+ <hr>
+ <ADDRESS>Lincoln D. Stein</ADDRESS><BR>
+ <A HREF="./">More Examples</A>
+ EOF
+     ;
+ print $q->end_html;
+ 
+ 
diff -cNr CGI-modules-2.75.orig/examples/index.html CGI-modules-2.75/examples/index.html
*** CGI-modules-2.75.orig/examples/index.html	Sat Mar 16 15:38:37 1996
--- CGI-modules-2.75/examples/index.html	Mon Apr 29 23:44:52 1996
***************
*** 36,41 ****
--- 36,47 ----
    <LI> <A HREF="file_upload.txt">Look at its source code</A>
  </UL>
  
+ <h2>Maintain state over a long period with a cookie</h2>
+ <ul>
+   <li><a href="cookie.cgi">Try the script</a>
+   <li><a href="cookie.text">Look at its source code</a>
+ </ul>
+ 
  <h2> Popup the response in a new window</h2>
  <ul>
    <li><a href="popup.cgi">Try the script</a>
***************
*** 63,68 ****
  <ADDRESS>Lincoln D. Stein, lstein@genome.wi.mit.edu<br>
  <a href="/">Whitehead Institute/MIT Center for Genome Research</a></ADDRESS>
  <!-- hhmts start -->
! Last modified: Sat Mar 16 21:38:37 MET 1996
  <!-- hhmts end -->
  </BODY> </HTML>
--- 69,74 ----
  <ADDRESS>Lincoln D. Stein, lstein@genome.wi.mit.edu<br>
  <a href="/">Whitehead Institute/MIT Center for Genome Research</a></ADDRESS>
  <!-- hhmts start -->
! Last modified: Wed Apr 24 22:24:40 EDT 1996
  <!-- hhmts end -->
  </BODY> </HTML>
diff -cNr CGI-modules-2.75.orig/examples/javascript.cgi CGI-modules-2.75/examples/javascript.cgi
*** CGI-modules-2.75.orig/examples/javascript.cgi	Wed Mar 20 17:34:00 1996
--- CGI-modules-2.75/examples/javascript.cgi	Mon Apr 29 23:44:52 1996
***************
*** 92,98 ****
  				  -onClick=>"doPraise(this)"),"<p>\n";
      print "Hair color: ",$q->popup_menu(-name=>'color',
  					-value=>[qw/brunette blonde red gray/],
! 					-default->'red',
  					-onChange=>"checkColor(this)"),"<p>\n";
      print $q->hidden(-name=>'age',-value=>0);
      print $q->submit();
--- 92,98 ----
  				  -onClick=>"doPraise(this)"),"<p>\n";
      print "Hair color: ",$q->popup_menu(-name=>'color',
  					-value=>[qw/brunette blonde red gray/],
! 					-default=>'red',
  					-onChange=>"checkColor(this)"),"<p>\n";
      print $q->hidden(-name=>'age',-value=>0);
      print $q->submit();
diff -cNr CGI-modules-2.75.orig/examples/javascript.txt CGI-modules-2.75/examples/javascript.txt
*** CGI-modules-2.75.orig/examples/javascript.txt	Wed Mar 20 17:34:00 1996
--- CGI-modules-2.75/examples/javascript.txt	Mon Apr 29 23:44:52 1996
***************
*** 92,98 ****
  				  -onClick=>"doPraise(this)"),"<p>\n";
      print "Hair color: ",$q->popup_menu(-name=>'color',
  					-value=>[qw/brunette blonde red gray/],
! 					-default->'red',
  					-onChange=>"checkColor(this)"),"<p>\n";
      print $q->hidden(-name=>'age',-value=>0);
      print $q->submit();
--- 92,98 ----
  				  -onClick=>"doPraise(this)"),"<p>\n";
      print "Hair color: ",$q->popup_menu(-name=>'color',
  					-value=>[qw/brunette blonde red gray/],
! 					-default=>'red',
  					-onChange=>"checkColor(this)"),"<p>\n";
      print $q->hidden(-name=>'age',-value=>0);
      print $q->submit();
diff -cNr CGI-modules-2.75.orig/examples/multiple_forms.cgi CGI-modules-2.75/examples/multiple_forms.cgi
*** CGI-modules-2.75.orig/examples/multiple_forms.cgi	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/examples/multiple_forms.cgi	Mon Apr 29 23:45:37 1996
***************
*** 0 ****
--- 1,54 ----
+ #!/usr/local/bin/perl
+ 
+ use CGI;
+ 
+ $query = new CGI;
+ print $query->header;
+ print $query->start_html('Multiple Forms');
+ print "<H1>Multiple Forms</H1>\n";
+ 
+ # Print the first form
+ print $query->startform;
+ $name = $query->remote_user || 'anonymous@' . $query->remote_host;
+ 
+ print "What's your name? ",$query->textfield('name',$name,50);
+ print "<P>What's the combination?<P>",
+         $query->checkbox_group('words',['eenie','meenie','minie','moe']);
+ print "<P>What's your favorite color? ",
+         $query->popup_menu('color',['red','green','blue','chartreuse']),
+ 	"<P>";
+ print $query->submit('form_1','Send Form 1');
+ print $query->endform;
+ 
+ # Print the second form
+ print "<HR>\n";
+ print $query->startform;
+ print "Some radio buttons: ",$query->radio_group('radio buttons',
+ 						 [qw{one two three four five}],'three'),"\n";
+ print "<P>What's the password? ",$query->password_field('pass','secret');
+ print $query->defaults,$query->submit('form_2','Send Form 2'),"\n";
+ print $query->endform;
+ 
+ print "<HR>\n";
+ 
+ $query->import('Q');
+ if ($Q::form_1) {
+     print "<H2>Form 1 Submitted</H2>\n";
+     print "Your name is <EM>$Q::name</EM>\n";
+     print "<P>The combination is: <EM>{",join(",",@Q::words),"}</EM>\n";
+     print "<P>Your favorite color is <EM>$Q::color</EM>\n";
+ } elsif ($Q::form_2) {
+     print <<EOF;
+ <H2>Form 2 Submitted</H2>
+ <P>The value of the radio buttons is <EM>$Q::radio_buttons</EM>
+ <P>The secret password is <EM>$Q::pass</EM>
+ EOF
+     ;
+ }
+ print qq{<P><A HREF="./">Other examples</A>};
+ print qq{<P><A HREF="../cgi_docs.html">Go to the documentation</A>};
+ 
+ print $query->end_html;
+ 
+ 
+ 
diff -cNr CGI-modules-2.75.orig/examples/multiple_forms.txt CGI-modules-2.75/examples/multiple_forms.txt
*** CGI-modules-2.75.orig/examples/multiple_forms.txt	Wed Dec 31 19:00:00 1969
--- CGI-modules-2.75/examples/multiple_forms.txt	Mon Apr 29 23:45:37 1996
***************
*** 0 ****
--- 1,54 ----
+ #!/usr/local/bin/perl
+ 
+ use CGI;
+ 
+ $query = new CGI;
+ print $query->header;
+ print $query->start_html('Multiple Forms');
+ print "<H1>Multiple Forms</H1>\n";
+ 
+ # Print the first form
+ print $query->startform;
+ $name = $query->remote_user || 'anonymous@' . $query->remote_host;
+ 
+ print "What's your name? ",$query->textfield('name',$name,50);
+ print "<P>What's the combination?<P>",
+         $query->checkbox_group('words',['eenie','meenie','minie','moe']);
+ print "<P>What's your favorite color? ",
+         $query->popup_menu('color',['red','green','blue','chartreuse']),
+ 	"<P>";
+ print $query->submit('form_1','Send Form 1');
+ print $query->endform;
+ 
+ # Print the second form
+ print "<HR>\n";
+ print $query->startform;
+ print "Some radio buttons: ",$query->radio_group('radio buttons',
+ 						 [qw{one two three four five}],'three'),"\n";
+ print "<P>What's the password? ",$query->password_field('pass','secret');
+ print $query->defaults,$query->submit('form_2','Send Form 2'),"\n";
+ print $query->endform;
+ 
+ print "<HR>\n";
+ 
+ $query->import('Q');
+ if ($Q::form_1) {
+     print "<H2>Form 1 Submitted</H2>\n";
+     print "Your name is <EM>$Q::name</EM>\n";
+     print "<P>The combination is: <EM>{",join(",",@Q::words),"}</EM>\n";
+     print "<P>Your favorite color is <EM>$Q::color</EM>\n";
+ } elsif ($Q::form_2) {
+     print <<EOF;
+ <H2>Form 2 Submitted</H2>
+ <P>The value of the radio buttons is <EM>$Q::radio_buttons</EM>
+ <P>The secret password is <EM>$Q::pass</EM>
+ EOF
+     ;
+ }
+ print qq{<P><A HREF="./">Other examples</A>};
+ print qq{<P><A HREF="../cgi_docs.html">Go to the documentation</A>};
+ 
+ print $query->end_html;
+ 
+ 
+