@@ -, +, @@ 
---
 src/modules/perl/modperl_apache_compat.h    |    1 -
 src/modules/perl/modperl_interp.c           |    5 -----
 src/modules/perl/modperl_module.c           |    2 +-
 xs/Apache2/Log/Apache2__Log.h               |    4 ++--
 xs/Apache2/ServerUtil/Apache2__ServerUtil.h |    4 ++--
 5 files changed, 5 insertions(+), 11 deletions(-)
--- a/src/modules/perl/modperl_apache_compat.h	
+++ a/src/modules/perl/modperl_apache_compat.h	
@@ -68,7 +68,6 @@ AP_DECLARE(const char *) ap_get_server_version(void);
 #define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1)
 #define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \
                                         OPT_ALL | \
-                                        OPT_INCNOEXEC | \
                                         OPT_SYM_OWNER | \
                                         OPT_MULTI)
 
--- a/src/modules/perl/modperl_interp.c	
+++ a/src/modules/perl/modperl_interp.c	
@@ -496,11 +496,6 @@ modperl_interp_t *modperl_interp_select(request_rec *r, conn_rec *c,
 
         set_interp(p);
 
-        MP_TRACE_i(MP_FUNC,
-                   "set interp 0x%lx in %s 0x%lx (%s request for %s)\n",
-                   (unsigned long)interp, desc, (unsigned long)p,
-                   (r ? (is_subrequest ? "sub" : "main") : "conn"),
-                   (r ? r->uri : c->remote_ip));
     }
 
     /* set context (THX) for this thread */
--- a/src/modules/perl/modperl_module.c	
+++ a/src/modules/perl/modperl_module.c	
@@ -832,7 +832,7 @@ const char *modperl_module_add(apr_pool_t *p, server_rec *s,
 
     modperl_module_insert(modp);
 
-    ap_add_loaded_module(modp, p);
+    ap_add_loaded_module(modp, p, modp->name);
 
     apr_pool_cleanup_register(p, modp, modperl_module_remove,
                               apr_pool_cleanup_null);
--- a/xs/Apache2/Log/Apache2__Log.h	
+++ a/xs/Apache2/Log/Apache2__Log.h	
@@ -48,13 +48,13 @@ static void mpxs_ap_log_error(pTHX_ int level, SV *sv, SV *msg)
         s = modperl_global_get_server_rec();
     }
 
-    if ((lmask == APLOG_DEBUG) && (s->loglevel >= APLOG_DEBUG)) {
+    if ((lmask == APLOG_DEBUG) && (s->log.level >= APLOG_DEBUG)) {
         COP *cop = PL_curcop;
         file = CopFILE(cop); /* (caller)[1] */
         line = CopLINE(cop); /* (caller)[2] */
     }
 
-    if ((s->loglevel >= lmask) &&
+    if ((s->log.level >= lmask) &&
         SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) {
         dSP;
         ENTER;SAVETMPS;
--- a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h	
+++ a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h	
@@ -160,8 +160,8 @@ SV *mpxs_Apache2__ServerRec_get_handlers(pTHX_ server_rec *s,
 #define mpxs_Apache2__ServerUtil_server(classname) modperl_global_get_server_rec()
 
 #if !defined(OS2) && !defined(WIN32) && !defined(BEOS)  && !defined(NETWARE)
-#define mpxs_Apache2__ServerUtil_user_id(classname)  unixd_config.user_id
-#define mpxs_Apache2__ServerUtil_group_id(classname) unixd_config.group_id
+#define mpxs_Apache2__ServerUtil_user_id(classname)  0
+#define mpxs_Apache2__ServerUtil_group_id(classname) 0
 #else
 #define mpxs_Apache2__ServerUtil_user_id(classname)  0
 #define mpxs_Apache2__ServerUtil_group_id(classname) 0
--