Changeset 554 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Feb 5, 2015, 7:17:31 PM (9 years ago)

Author:

knut

Message:

Changed the WIN32 version of function zGettimeofday. Changed return type for getShmLockId (WIN32). Changed type of _HINTERNET.mimeType from unsigned char* to char*. Fixed interconnected memory issues in functions getKeyValue and getShmLockId (WIN32). Added code to transfer the correct unique process identifier (usid) to background processes (applies to WIN32 version).

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -781 +781 @@
   fprintf (stderr, "REQUEST IS : %s \n", tmp);
 #endif
+
+  map* usid = getMapFromMaps (m, "lenv", "usid");
+  if (usid != NULL && usid->value != NULL) {
+    SetEnvironmentVariable("USID", TEXT (usid->value));
+  }
+
   SetEnvironmentVariable ("CGISID", TEXT (sid->value));
   SetEnvironmentVariable ("QUERY_STRING", TEXT (tmpq));
@@ -824 +830 @@
 
 #ifndef USE_GDB
+#ifndef WIN32
   signal (SIGCHLD, SIG_IGN);
+#endif  
   signal (SIGSEGV, sig_handler);
   signal (SIGTERM, sig_handler);
@@ -3203 +3211 @@
   _tmpMaps->name = zStrdup ("lenv");
   char tmpBuff[100];
-  int lid = getShmLockId (NULL, 1);
+  semid lid = getShmLockId (NULL, 1);
   lockShm (lid);
   struct ztimeval tp;
@@ -3307 +3315 @@
   if (getenv ("CGISID") != NULL)
     addToMap (request_inputs, "cgiSid", getenv ("CGISID"));
+
+  char* usidp;
+  if ( (usidp = getenv("USID")) != NULL ) {
+    setMapInMaps (m, "lenv", "usid", usidp);
+  }
+
   map *test1 = getMap (request_inputs, "cgiSid");
   if (test1 != NULL)