httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/os/win32 util_win32.c
Date Tue, 24 Oct 2000 11:54:29 GMT
wrowe       00/10/24 04:54:29

  Modified:    src      ApacheCore.def
               src/include ap_mpm.h
               src/modules/standard mod_include.c
               src/os/win32 util_win32.c
  Log:
    Get everything working with suexec patches again.
  
  Revision  Changes    Path
  1.35      +4 -4      apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ApacheCore.def	2000/10/18 17:38:54	1.34
  +++ ApacheCore.def	2000/10/24 11:54:26	1.35
  @@ -433,7 +433,7 @@
          ap_bucket_create_transient @460
          ap_bucket_split_shared @461
          ap_bucket_make_shared  @462
  -       ap_bucket_destroy_shared @463
  -       
  -        ap_bucket_create_pool @464
  -        ap_flush_type         @465 DATA
  \ No newline at end of file
  +       ap_bucket_destroy_shared @463       
  +       ap_bucket_create_pool @464
  +
  +       ap_os_create_privileged_process @465
  
  
  
  1.19      +7 -4      apache-2.0/src/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_mpm.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ap_mpm.h	2000/10/23 15:30:49	1.18
  +++ ap_mpm.h	2000/10/24 11:54:27	1.19
  @@ -154,10 +154,13 @@
    *         process
    * @param p The pool to use. 
    */
  -extern apr_status_t ap_os_create_privileged_process(const request_rec *r,
  -                              apr_proc_t *newproc, const char *progname,
  -                              char *const *args, char **env,
  -                              apr_procattr_t *attr, apr_pool_t *p);
  +AP_DECLARE(apr_status_t) ap_os_create_privileged_process(const request_rec *r,
  +                                                         apr_proc_t *newproc, 
  +                                                         const char *progname,
  +                                                         char *const *args, 
  +                                                         char **env,
  +                                                         apr_procattr_t *attr, 
  +                                                         apr_pool_t *p);
   
   
   #endif
  
  
  
  1.72      +1 -0      apache-2.0/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_include.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- mod_include.c	2000/10/23 15:30:53	1.71
  +++ mod_include.c	2000/10/24 11:54:28	1.72
  @@ -99,6 +99,7 @@
   #include "http_main.h"
   #include "util_script.h"
   #include "http_core.h"
  +#include "ap_mpm.h"
   #ifdef HAVE_STRING_H
   #include <string.h>
   #endif
  
  
  
  1.18      +9 -0      apache-2.0/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/win32/util_win32.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- util_win32.c	2000/10/16 06:05:13	1.17
  +++ util_win32.c	2000/10/24 11:54:29	1.18
  @@ -501,3 +501,12 @@
   
       return 1;
   }
  +
  +AP_DECLARE(apr_status_t) ap_os_create_privileged_process(const request_rec *r,
  +                              apr_proc_t *newproc, const char *progname,
  +                              char *const *args, char **env,
  +                              apr_procattr_t *attr, apr_pool_t *p)
  +{
  +    return APR_ENOTIMPL;
  +}
  +
  
  
  

Mime
View raw message