httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r709060 - in /httpd/httpd/trunk/server/mpm/simple: simple_api.c simple_types.h
Date Thu, 30 Oct 2008 00:39:19 GMT
Author: pquerna
Date: Wed Oct 29 17:39:19 2008
New Revision: 709060

URL: http://svn.apache.org/viewvc?rev=709060&view=rev
Log:
Remove SimpleUser configuration command, this will all be handled inside mod_unixd.

Modified:
    httpd/httpd/trunk/server/mpm/simple/simple_api.c
    httpd/httpd/trunk/server/mpm/simple/simple_types.h

Modified: httpd/httpd/trunk/server/mpm/simple/simple_api.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_api.c?rev=709060&r1=709059&r2=709060&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_api.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_api.c Wed Oct 29 17:39:19 2008
@@ -277,28 +277,11 @@
   return NULL;
 }
 
-static const char*
-set_user(cmd_parms *cmd, void *baton, const char *arg)
-{
-  simple_core_t *sc = simple_core_get();
-  const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-  if (err != NULL) {
-    return err;
-  }
-  
-  sc->procmgr.user_name = arg;
-  sc->procmgr.user_id = ap_uname2id(arg);
-
-  return NULL;
-}
-
 static const command_rec simple_cmds[] = {
   AP_INIT_TAKE1("SimpleProcCount", set_proccount, NULL, RSRC_CONF,
                 "Number of child processes launched at server startup"),
   AP_INIT_TAKE1("SimpleThreadCount", set_threadcount, NULL, RSRC_CONF,
                 "Set the number of Worker Threads Per-Process"),
-  AP_INIT_TAKE1("SimpleUser", set_user, NULL, RSRC_CONF,
-                "Sets the user to run child processes as"),
   /* pqXXXXXXXXX: These do NOT belong in the MPM configuration commands. */
   LISTEN_COMMANDS,
   { NULL }

Modified: httpd/httpd/trunk/server/mpm/simple/simple_types.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_types.h?rev=709060&r1=709059&r2=709060&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_types.h (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_types.h Wed Oct 29 17:39:19 2008
@@ -32,8 +32,6 @@
   int proc_count;
   int thread_count;
   int max_requests_per_child;
-  int user_id;
-  const char *user_name;
 } simple_proc_mgr_t;
 
 typedef struct {



Mime
View raw message