From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 24 Oct 2000 11:54:29 +0000 (+0000)
Subject:   Get everything working with suexec patches again.
X-Git-Tag: APACHE_2_0_ALPHA_8~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bf04d205330c821d5f162fb61dc1ec25b0282f5;p=apache

  Get everything working with suexec patches again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86731 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/ApacheCore.def b/ApacheCore.def
index cbea6aa505..3f1da6df1a 100644
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -433,7 +433,7 @@ EXPORTS
        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
diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 945b647d7c..864d69a9c0 100644
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -154,10 +154,13 @@ AP_DECLARE(void) ap_start_shutdown(void);
  *         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
diff --git a/libhttpd.def b/libhttpd.def
index cbea6aa505..3f1da6df1a 100644
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -433,7 +433,7 @@ EXPORTS
        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
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index c45fa2348a..5bd7a4f815 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -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
diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index bccff8f803..c958d27770 100644
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -501,3 +501,12 @@ AP_DECLARE(int) ap_os_is_filename_valid(const char *file)
 
     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;
+}
+