cvs commit: apache/src/regex Makefile

[Randy Terbush]

randy       96/07/26 21:25:43

  Modified:    src       util_script.c
  Log:
  Cleanup unused variable.
  
  Revision  Changes    Path
  1.15      +10 -7     apache/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -C3 -r1.14 -r1.15
  *** util_script.c     1996/07/27 02:49:35     1.14
  --- util_script.c     1996/07/27 04:24:43     1.15
  ***************
  *** 369,400 ****
    
    void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
    {
  !     char *execuser;
    
  !     
  !     core_dir_config *conf = (core_dir_config *)pcalloc(r->pool, 
sizeof(core_dir_config));
        
        conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);
    
    #ifdef RLIMIT_CPU
        if (conf->limit_cpu != NULL)
        if ((setrlimit (RLIMIT_CPU, conf->limit_cpu)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set CPU usage limit", 
r->server);
    #endif
    #ifdef RLIMIT_NPROC
        if (conf->limit_nproc != NULL)
        if ((setrlimit (RLIMIT_NPROC, conf->limit_nproc)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set process limit", 
r->server);
    #endif
    #ifdef RLIMIT_DATA
        if (conf->limit_mem != NULL)
        if ((setrlimit (RLIMIT_DATA, conf->limit_mem)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set memory usage limit", 
r->server);
    #endif
    #ifdef RLIMIT_VMEM
        if (conf->limit_mem != NULL)
        if ((setrlimit (RLIMIT_VMEM, conf->limit_mem)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set memory usage limit", 
r->server);
    #endif
        
    #ifdef __EMX__    
  --- 369,403 ----
    
    void call_exec (request_rec *r, char *argv0, char **env, int shellcmd) 
    {
  !     core_dir_config *conf;
    
  !     conf = (core_dir_config *)pcalloc(r->pool, sizeof(core_dir_config));
        
        conf = (core_dir_config *)get_module_config(r->per_dir_config, 
&core_module);
    
    #ifdef RLIMIT_CPU
        if (conf->limit_cpu != NULL)
        if ((setrlimit (RLIMIT_CPU, conf->limit_cpu)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set CPU usage limit",
  !                     r->server);
    #endif
    #ifdef RLIMIT_NPROC
        if (conf->limit_nproc != NULL)
        if ((setrlimit (RLIMIT_NPROC, conf->limit_nproc)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set process limit",
  !                     r->server);
    #endif
    #ifdef RLIMIT_DATA
        if (conf->limit_mem != NULL)
        if ((setrlimit (RLIMIT_DATA, conf->limit_mem)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set memory usage limit",
  !                     r->server);
    #endif
    #ifdef RLIMIT_VMEM
        if (conf->limit_mem != NULL)
        if ((setrlimit (RLIMIT_VMEM, conf->limit_mem)) != 0)
  !         log_unixerr("setrlimit", NULL, "failed to set memory usage limit",
  !                     r->server);
    #endif
        
    #ifdef __EMX__    
  
  
  

  Modified:    src/regex  Makefile
  Log:
  Some systems will need ranlib. Hopefully others will fake it.
  
  Revision  Changes    Path
  1.3       +1 -0      apache/src/regex/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/Makefile,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -C3 -r1.2 -r1.3
  *** Makefile  1996/07/25 08:56:26     1.2
  --- Makefile  1996/07/27 04:25:42     1.3
  ***************
  *** 40,45 ****
  --- 40,46 ----
    lib:        purge $(OBJPRODN)
        rm -f libregex.a
        ar crv libregex.a $(OBJPRODN)
  +     ranlib libregex.a
    
    purge:
        rm -f *.o