MiniVend 3.14-4

interchange · Jan 2, 2009 · 389707b · 389707b
1 parent f5bd676
commit 389707b
Show file tree

Hide file tree

Showing 27 changed files with 68 additions and 213 deletions.
diff --git a/INSTALL b/INSTALL
@@ -22,7 +22,7 @@ IMPORTANT NOTE: The installation procedure has changed, we hope for the
 WINDOWS INSTALLATION
 --------------------
 
-    Obtain the self-extracting executable minivend-3.14-2.exe
+    Obtain the self-extracting executable minivend-3.14-4.exe
     and double-click on it.
 
     IMPORTANT NOTE: If you get the message "Bad command or file name"
@@ -33,7 +33,7 @@ WINDOWS INSTALLATION
     appears to work well with the ActiveState 5.005 "Merge" port.
 
     If you already have the CYGWIN.DLL executable or plan on using the
-    Perl link CGI, you can download the file minivend-3.14-2-nodll.exe
+    Perl link CGI, you can download the file minivend-3.14-4-nodll.exe
     and do the same.
 
     The defaults are set for Microsoft Personal Web Server on Win95 --
@@ -60,19 +60,19 @@ UNIX INSTALLATION
 ------------------
 Here is the short version:
 
-    gzip -dc minivend-3.14-2.tar.gz | tar xvf -
-    cd minivend-3.14-2
+    gzip -dc minivend-3.14-4.tar.gz | tar xvf -
+    cd minivend-3.14-4
     ./configure
 
 Long version with comments:
 
     # Unzip and untar the file -- if you have GNU tar, you can substitute
-    # 'tar xzf minivend-3.14-2.tar.gz'
-    gzip -dc minivend-3.14-2.tar.gz | tar xvf -
+    # 'tar xzf minivend-3.14-4.tar.gz'
+    gzip -dc minivend-3.14-4.tar.gz | tar xvf -
 
     # Change directory to the one that was created 
     #
-    cd minivend-3.14-2
+    cd minivend-3.14-4
 
     # If you have trouble with picking up the wrong Perl version,
     # try  '/dir/where/perl/is/perl Makefile.PL

diff --git a/MANIFEST b/MANIFEST
@@ -169,7 +169,6 @@ dist/simple/images/mvlogo.gif
 dist/simple/images/mvlogo_dark.gif
 dist/simple/images/new.gif
 dist/simple/images/perl_id_313c.gif
-dist/simple/images/staircase.jpg
 dist/simple/images/redball.gif
 dist/simple/images/smallamex.gif
 dist/simple/images/smalldisc.gif

diff --git a/Makefile.PL b/Makefile.PL
@@ -26,7 +26,7 @@ my @mods_to_get;
 my $Lock_troubles;
 my $Windows;
 
-$VERSION = '3.14-2';
+$VERSION = '3.12';
 
 # See if we have the CPAN module
 my $Cpan = 0;

diff --git a/configure.bat b/configure.bat
@@ -8,5 +8,5 @@ echo ------------------------------------------------------------
 echo IF YOU DO HAVE PERL 5.004 installed,
 echo unzip the file to a directory and try:
 echo ------------------------------------------------------------
-echo    cd minivend-3.14-2
+echo    cd minivend-3.14-4
 echo    c:\perl\bin\perl Makefile.PL
diff --git a/dist/README b/dist/README
@@ -1,4 +1,4 @@
-# MiniVend V3.14-2
+# MiniVend V3.14-4
 # 
 # Copyright 1996-1999 by Michael J. Heins <mikeh@minivend.com>
 #
@@ -30,7 +30,7 @@ interested in problems, suggestions, or comments, but does not have time
 to offer free individual support in most cases. See the MiniVend website at
 http://www.minivend.com/minivend/ for more information.
 
-   IMPORTANT NOTE:  MiniVend 3.14-2 requires Perl 5.004 or higher. It will
+   IMPORTANT NOTE:  MiniVend 3.14-4 requires Perl 5.004 or higher. It will
                     run on no earlier version, period. 5.005 is recommended.
 
 The information you need is in the following files:
@@ -198,7 +198,7 @@ standard distribution. You can get it at http://www.perl.com/CPAN-local
 WINDOWS INSTALLATION
 --------------------
 
-    Obtain the self-extracting executable minivend-3.14-2.exe
+    Obtain the self-extracting executable minivend-3.14-4.exe
     and double-click on it. You MUST already have Perl 5.004
     INSTALLED and in your PATH.
 
@@ -209,8 +209,8 @@ UNIX INSTALLATION
 ------------------
 Here is the short version:
 
-    gzip -dc minivend-3.14-2.tar.gz | tar xvf -
-    cd minivend-3.14-2
+    gzip -dc minivend-3.14-4.tar.gz | tar xvf -
+    cd minivend-3.14-4
     ./configure
 
 More information is in the file INSTALL.

diff --git a/dist/README-win.txt b/dist/README-win.txt
@@ -1,4 +1,4 @@
-# MiniVend V3.14-2
+# MiniVend V3.14-4
 # 
 # Copyright 1996-1998 by Michael J. Heins <mikeh@iac.net>
 #
@@ -116,16 +116,16 @@
 
     Installation:
 
-    1. Download the minivend-3.14-2.exe distribution file
+    1. Download the minivend-3.14-4.exe distribution file
     and run it in the normal Windows fashion.
 
     ( If you don't want to execute the self-extracting ZIP file,
-      then you can obtain the standard minivend-3.14-2.tar.gz file and
+      then you can obtain the standard minivend-3.14-4.tar.gz file and
       install that instead. )
 
       You will have to obtain the CYGWIN.DLL file if you want to
       use TLINK.EXE as your link CGI. The standard distribution .EXE
-      file has it included -- the minivend-3.14-2-nodll.exe file
+      file has it included -- the minivend-3.14-4-nodll.exe file
       eliminates it.
 
     2. Select a directory to install MiniVend in -- it defaults
@@ -173,7 +173,7 @@
       * Since the server runs in the foreground, if you change
         global variables in your embedded Perl you must be careful
         to reset them. In particular, the FRAMES version of the 
-        3.14-2 demo will not work correctly.
+        3.14-4 demo will not work correctly.
 
       * Some of the support scripts will not work, and some
         might not behave as in the documentation. In particular,

diff --git a/dist/README.OS b/dist/README.OS
@@ -1,4 +1,4 @@
-# MiniVend V3.14-2
+# MiniVend V3.14-3
 # 
 # Copyright 1996-1999 by Michael J. Heins <mikeh@minivend.com>
 #

diff --git a/dist/WHATSNEW b/dist/WHATSNEW
@@ -1,6 +1,16 @@
 
                   W H A T ' S   N E W 
 
+MiniVend 3.14-4 adds file globbing to #include lines.
+
+MiniVend 3.14-3 is a simple bug-fix release close on the heels
+of the short-lived 3.14-2 (session id stuff not quite fixed
+completely, forgot to transfer one line of code).
+
+    * Removes "index" warnings that appear in 5.004 perls.
+
+	* Added code to bypass retired IDs in session
+
 MiniVend 3.14-2 is a simple bug-fix release close on the heels
 of the defective 3.14-1 (session id stuff not really fixed).
 

diff --git a/dist/bin/minivend b/dist/bin/minivend
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# MiniVend version 3.14-2
+# MiniVend version 3.14-4
 #
 # $Id: minivend,v 1.38 1999/02/12 12:24:23 mike Exp $
 #
@@ -151,7 +151,7 @@ sub debug {
 }
 
 BEGIN {
-	$VERSION = '3.14-2';
+	$VERSION = '3.14-4';
 }
 use strict;
 use Fcntl;
@@ -2214,6 +2214,7 @@ sub retire_id {
 			return undef;
 		};
 	$Vend::RetireDBM{$id} = 1;
+	untie(%Vend::RetireDBM);
 	return;
 }
 
@@ -2474,13 +2475,15 @@ EOF
     	$Vend::SessionName = session_name();
 		get_session();
 		my $now = time;
-		if ($Vend::Session->{'expire'}) {
-			retire_id($sessionid), new_session() if
-				$now > $Vend::Session->{'expire'};
-
-		}
-		elsif ($now - $Vend::Session->{'time'} > $Vend::Cfg->{'SessionExpire'}) {
-	    	retire_id($sessionid);
+		# Removed due to deadlock problems
+#		if ($Vend::Session->{'expire'}) {
+#			retire_id($sessionid), new_session() if
+#				$now > $Vend::Session->{'expire'};
+#				
+#		}
+#		elsif ($now - $Vend::Session->{'time'} > $Vend::Cfg->{'SessionExpire'}) {
+		if ($now - $Vend::Session->{'time'} > $Vend::Cfg->{'SessionExpire'}) {
+	    	#retire_id($sessionid);
 			new_session();
 		}
 		elsif($Vend::Cfg->{RobotLimit}) {

diff --git a/dist/configure.pl b/dist/configure.pl
@@ -361,7 +361,7 @@ sub get_detailed_param {
 then you might know enough to get it running with 5.003. But personally
 I wouldn't try.)
 
-Please upgrade your Perl before installing MiniVend 3.14-2.
+Please upgrade your Perl before installing MiniVend 3.14-4.
 
 EOF
 

diff --git a/dist/flycat/etc/report.html b/dist/flycat/etc/report.html
diff --git a/dist/manifest b/dist/manifest
@@ -1,4 +1,4 @@
-### MiniVend 3.14-2 Manifest ###
+### MiniVend 3.14-4 Manifest ###
 ###                        ###
 ###   DON'T edit this !!!  ###
 ###                        ###

diff --git a/dist/simple/images/coolad1.gif b/dist/simple/images/coolad1.gif
diff --git a/dist/simple/images/staircase.jpg b/dist/simple/images/staircase.jpg
diff --git a/dist/simple/pages/frames/left.html b/dist/simple/pages/frames/left.html
@@ -57,10 +57,6 @@
 	 di=category
 	 df=yes
 	 dl=Surrealists]"><FONT SIZE=2 FACE=ARIAL,HELVETICA style="text-decoration: none"><B>surrealists&nbsp;</FONT></A><BR></TD></TR>
-<TR><TD VALIGN=top [var TABLEFG] ALIGN=right width=100%><A HREF="[area scan
-	 di=category
-	 df=yes
-	 dl=Contemporary]"><FONT SIZE=2 FACE=ARIAL,HELVETICA style="text-decoration: none"><B>contemporary&nbsp;</FONT></A><BR></TD></TR>
 <TR><TD VALIGN=top>
 [if session logged_in]
 [then]

diff --git a/dist/simple/pages/leftside b/dist/simple/pages/leftside
@@ -54,10 +54,6 @@ ABOUT US&nbsp;</FONT></A><BR></TD></TR>
 	 di=category
 	 df=yes
 	 dl=Surrealists]"><FONT SIZE=2 FACE=ARIAL,HELVETICA style="text-decoration: none"><B>surrealists&nbsp;</FONT></A><BR></TD></TR>
-<TR><TD VALIGN=top [var TABLEFG] ALIGN=right width=100%><A HREF="[area scan
-	 di=category
-	 df=yes
-	 dl=Contemporary]"><FONT SIZE=2 FACE=ARIAL,HELVETICA style="text-decoration: none"><B>contemporary&nbsp;</FONT></A><BR></TD></TR>
 <TR><TD VALIGN=top>
 [if session logged_in]
 [then]

diff --git a/dist/simple/pages/rand4.html b/dist/simple/pages/rand4.html
@@ -1 +1 @@
-19-202 34-101
+99-102 34-101
diff --git a/dist/simple/pages/rotate1.html b/dist/simple/pages/rotate1.html
@@ -1 +1 @@
-<A HREF="http://www.cool.com/"><IMG SRC="coolad1.gif"></A>
+<A HREF="http://www.coolios.com/"><IMG SRC="coolad1.gif"></A>