More MPM changes. Remove ap_can_exec and add a couple prototypes.

Submitted by:	Dean Gaudet

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

diff --git a/include/httpd.h b/include/httpd.h
index fe736a230a6cb23ce116dd5c873b9584ce3c1199..04a0c14082a93576933db144176acb52ebc86c06 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1013,8 +1013,9 @@ char *strerror(int err);
 API_EXPORT(uid_t) ap_uname2id(const char *name);
 API_EXPORT(gid_t) ap_gname2id(const char *name);
 API_EXPORT(int) ap_is_directory(const char *name);
-API_EXPORT(int) ap_can_exec(const struct stat *);
 API_EXPORT(void) ap_chdir_file(const char *file);
+API_EXPORT(int) ap_get_max_daemons(void);
+API_EXPORT(const server_rec *) ap_get_server_conf(void);
 
 #ifndef HAVE_CANONICAL_FILENAME
 /*

diff --git a/server/util.c b/server/util.c
index d03c2052da0f218d1675f2e9a18bb035a045027f..15245a497515a5e7bf460b7a7b44d7019d9c19e0 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1684,32 +1684,6 @@ API_EXPORT(int) ap_is_url(const char *u)
     return (x ? 1 : 0);                /* If the first character is ':', it's broken, too */
 }
 
-API_EXPORT(int) ap_can_exec(const struct stat *finfo)
-{
-#ifdef MULTIPLE_GROUPS
-    int cnt;
-#endif
-#if defined(OS2) || defined(WIN32)
-    /* OS/2 dosen't have Users and Groups */
-    return 1;
-#else
-    if (ap_user_id == finfo->st_uid)
-       if (finfo->st_mode & S_IXUSR)
-           return 1;
-    if (ap_group_id == finfo->st_gid)
-       if (finfo->st_mode & S_IXGRP)
-           return 1;
-#ifdef MULTIPLE_GROUPS
-    for (cnt = 0; cnt < NGROUPS_MAX; cnt++) {
-       if (group_id_list[cnt] == finfo->st_gid)
-           if (finfo->st_mode & S_IXGRP)
-               return 1;
-    }
-#endif
-    return (finfo->st_mode & S_IXOTH);
-#endif
-}
-
 #ifdef NEED_STRDUP
 char *strdup(const char *str)
 {