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 cbea6aa505e0f8039d95d91ea1f1a98f794c4328..3f1da6df1a29b8dbb6b26944a7266e75f3b18c62 100644 (file)
--- 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 945b647d7ce8c1cb9924b09cb83683d5a3e2b704..864d69a9c039c15c2eae0d8157f92676743e6ff2 100644 (file)
--- 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 cbea6aa505e0f8039d95d91ea1f1a98f794c4328..3f1da6df1a29b8dbb6b26944a7266e75f3b18c62 100644 (file)
--- 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 c45fa2348a6ef5a38f1be5dbd274e8386b29595a..5bd7a4f8156404729d32b8371f6ed1e52a6c1c54 100644 (file)
--- 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 bccff8f8035098d04841f43164648fba1ef52d21..c958d27770b98ad5ef0e9d4a88af9825bc5de672 100644 (file)
--- 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;
+}
+