httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/netware mpm_netware.c
Date Tue, 02 Apr 2002 00:29:24 GMT
bnicholes    02/04/01 16:29:23

  Modified:    server/mpm/netware mpm_netware.c
  Log:
  Replaced a hack for getting the address space with the real API
  
  Revision  Changes    Path
  1.43      +10 -11    httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- mpm_netware.c	29 Mar 2002 14:33:50 -0000	1.42
  +++ mpm_netware.c	2 Apr 2002 00:29:23 -0000	1.43
  @@ -971,24 +971,20 @@
       return 0;
   }
   
  -/* GetCurrentAddressSpace - this should be replaced with the correct header file when available!
*/
  -struct _BogusAddressSpace { int a; int b; int c; char name[]; };
  -typedef struct _BogusAddressSpace BogusAddressSpace;
  -extern BogusAddressSpace* GetCurrentAddressSpace(void);
  -/* GetCurrentAddressSpace */
  -
   static int netware_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
   {
       int debug;
  -    BogusAddressSpace *addrspace = NULL;
  +    char *addrname = NULL;
   
       debug = ap_exists_config_define("DEBUG");
   
       is_graceful = 0;
       ap_my_pid = getpid();
  -    addrspace = GetCurrentAddressSpace();
  -    if (addrspace)
  -        ap_my_addrspace = apr_pstrdup (p, addrspace->name);
  +    addrname = getaddressspacename (NULL, NULL);
  +    if (addrname) {
  +        ap_my_addrspace = apr_pstrdup (p, addrname);
  +        free (addrname);
  +    }
   
       ap_listen_pre_config();
       ap_threads_to_start = DEFAULT_START_THREADS;
  @@ -1100,7 +1096,10 @@
   
           /* If we got an instance id but it doesn't match this 
               instance of the nlm, pass it on. */
  -        if (pID && ap_my_addrspace && strnicmp(&pID[2], ap_my_addrspace,
strlen(ap_my_addrspace)))
  +        pID = &pID[2];
  +        while (*pID && (*pID == ' '))
  +            pID++;
  +        if (*pID && ap_my_addrspace && strnicmp(pID, ap_my_addrspace, strlen(ap_my_addrspace)))
               return NOTMYCOMMAND;
   
           /* If we have determined that this command belongs to this
  
  
  

Mime
View raw message