v1.1.11 update

src/python/build_pyrte.com

@@ -61,7 +61,7 @@
 $!
 $    SET NOON
 $    SET VERIFY
-$ LINK /THREADS_ENABLE/EXECUTABLE=HT_EXE:PYRTE.EXE -
+$ LINK /THREADS_ENABLE/EXECUTABLE=WASD_EXE:PYRTE.EXE -
 [.OBJ_'ARCH_NAME']PYRTE.OBJ, -
 SYS$INPUT:/OPTIONS 
 IDENTIFICATION="''IMAGE_IDENT'"

src/python/pyrte.c

@@ -187,7 +187,7 @@
 
 PYRTE COPYRIGHT
 ---------------
-Copyright (C) 2007-2011 Mark G.Daniel
+Copyright (C) 2007-2013 Mark G.Daniel
 This package comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it under the
 conditions of the GNU GENERAL PUBLIC LICENSE, version 3, or any later version.
@@ -291,8 +291,8 @@
 -------------
 $ @BUILD_PYRTE BUILD  !compile+link
 $ @BUILD_PYRTE LINK   !link-only
-$ COPY HT_EXE:PYRTE.EXE CGI_EXE:
+$ COPY WASD_EXE:PYRTE.EXE CGI_EXE:
 
 
 VERSION HISTORY (update SOFTWAREVN as well!)
 ---------------
@@ -295,7 +295,11 @@
 
 
 VERSION HISTORY (update SOFTWAREVN as well!)
 ---------------
+20-JUN-2013  MGD  v1.1.11, bugfix; ProcessCachingRte() it appears to be
+                             necessary to destroy *EnvironDict along with
+                             using Py_EndInterpreter()
+                           bugfix; usage limit should be greater than equal to
 05-NOV-2011  MGD  v1.1.10, Python 2.7.2, see changes to includes
 27-FEB-2011  MGD  v1.1.9, /CLI= to allow a command-line script activation
                           logical PYRTE_METRICS enables "?$metrics$" report
@@ -319,8 +323,8 @@
 */
 /*****************************************************************************/
 
-#define SOFTWARECR "Copyright (C) 2007-2011 Mark G.Daniel"
-#define SOFTWAREVN "1.1.10"
+#define SOFTWARECR "Copyright (C) 2007-2013 Mark G.Daniel"
+#define SOFTWAREVN "1.1.11"
 #define SOFTWARENM "PYRTE"
 #ifdef __ALPHA
 #  define SOFTWAREID SOFTWARENM " AXP-" SOFTWAREVN
@@ -352,7 +356,7 @@
 
    with HP C V7.1-011 on OpenVMS IA64 V8.4, and
 
-   ctime_r ((const int*)tsecs,buf);
+   ctime_r (tsecs,buf);
 ............^
 %CC-W-PTRMISMATCH, In this statement, the referenced type of the pointer value
 "(const int ...)tsecs" is "const int", which is not compatible with "const unsigned long".
@@ -468,6 +472,7 @@
           *pMainDict,
           *pMainModule,
           *pOsDict,
+          *pOsEnvironDict,
           *pOsModule,
           *pWasdModule,
           *pWsgiExcInfo,
@@ -1146,7 +1151,7 @@
 
       if (!GlobalDebug) Debug = 0;
 
-      if (UsageLimit && UsageCount > UsageLimit) break;
+      if (UsageLimit && UsageCount >= UsageLimit) break;
    }
 }
 
@@ -1477,8 +1482,12 @@
             PyThreadState_Swap (pStateBuffer);
             ccptr->pInterpState = NULL;
             ccptr->InterpreterUsageCount = 0;
+            /* these seem to need to go after the interpreter */
+            Py_DECREF (pEnvironDict);
+            Py_DECREF (pOsEnvironDict);
+            pEnvironDict = pOsEnvironDict = NULL;
          }
       }
 
       if (!GlobalDebug) Debug = 0;
 
@@ -1480,9 +1489,9 @@
          }
       }
 
       if (!GlobalDebug) Debug = 0;
 
-      if (UsageLimit && UsageCount > UsageLimit) break;
+      if (UsageLimit && UsageCount >= UsageLimit) break;
    }
 
    Py_Finalize();
@@ -1756,7 +1765,6 @@
 
 {
    static char  RequestMethodGet[] = "REQUEST_METHOD=GET";
-   static PyObject  *pOsEnvironDict;
 
    int  retval;
    char  *cptr, *sptr,

src/python/readme.txt

-PYRTE CGI/CGIplus/RTE/WSGI Python interface for the WASD Web server.
-
-Check READMORE.HTML for build and configuration information.
-
-PYRTE COPYRIGHT
----------------
-Copyright (C) 2007-2011 Mark G.Daniel
-This package comes with ABSOLUTELY NO WARRANTY.
-This is free software, and you are welcome to redistribute it under the
-conditions of the GNU GENERAL PUBLIC LICENSE, version 3, or any later version.
-
-  http://www.gnu.org/licenses/gpl.txt
-
-PYTHON COPYRIGHT
-----------------
-Python is subject to it's own PSF license.
-
-  http://www.python.org/psf/license.html