Attachment #307645 for bug #410453

Lines 68-74 AP_DECLARE(const char *) ap_get_server_version(void); Link Here

(-)a/src/modules/perl/modperl_apache_compat.h (-1 lines)
68	#define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1)	68	#define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1)
69	#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET \| \	69	#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET \| \
70	OPT_ALL \| \	70	OPT_ALL \| \
71	OPT_INCNOEXEC \| \
72	OPT_SYM_OWNER \| \	71	OPT_SYM_OWNER \| \
73	OPT_MULTI)	72	OPT_MULTI)
74		73

Lines 496-506 modperl_interp_t modperl_interp_select(request_rec r, conn_rec *c, Link Here

(-)a/src/modules/perl/modperl_interp.c (-5 lines)
496		496
497	set_interp(p);	497	set_interp(p);
498		498
499	MP_TRACE_i(MP_FUNC,
500	"set interp 0x%lx in %s 0x%lx (%s request for %s)\n",
501	(unsigned long)interp, desc, (unsigned long)p,
502	(r ? (is_subrequest ? "sub" : "main") : "conn"),
503	(r ? r->uri : c->remote_ip));
504	}	499	}
505		500
506	/* set context (THX) for this thread */	501	/* set context (THX) for this thread */

Lines 832-838 const char modperl_module_add(apr_pool_t p, server_rec *s, Link Here

(-)a/src/modules/perl/modperl_module.c (-1 / +1 lines)
832		832
833	modperl_module_insert(modp);	833	modperl_module_insert(modp);
834		834
835	ap_add_loaded_module(modp, p);	835	ap_add_loaded_module(modp, p, modp->name);
836		836
837	apr_pool_cleanup_register(p, modp, modperl_module_remove,	837	apr_pool_cleanup_register(p, modp, modperl_module_remove,
838	apr_pool_cleanup_null);	838	apr_pool_cleanup_null);




        s = modperl_global_get_server_rec();
    }

    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->log.level >= lmask) &&
        SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) {
        dSP;
        ENTER;SAVETMPS;

Lines 160-167 SV mpxs_Apache2__ServerRec_get_handlers(pTHX_ server_rec s, Link Here

(-)a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h (-3 / +2 lines)
160	#define mpxs_Apache2__ServerUtil_server(classname) modperl_global_get_server_rec()	160	#define mpxs_Apache2__ServerUtil_server(classname) modperl_global_get_server_rec()
161		161
162	#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)	162	#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
163	#define mpxs_Apache2__ServerUtil_user_id(classname) unixd_config.user_id	163	#define mpxs_Apache2__ServerUtil_user_id(classname) 0
164	#define mpxs_Apache2__ServerUtil_group_id(classname) unixd_config.group_id	164	#define mpxs_Apache2__ServerUtil_group_id(classname) 0
165	#else	165	#else
166	#define mpxs_Apache2__ServerUtil_user_id(classname) 0	166	#define mpxs_Apache2__ServerUtil_user_id(classname) 0
167	#define mpxs_Apache2__ServerUtil_group_id(classname) 0	167	#define mpxs_Apache2__ServerUtil_group_id(classname) 0
168	-

Return to bug 410453

Lines 48-60 static void mpxs_ap_log_error(pTHX_ int level, SV sv, SV msg) Link Here

(-)a/xs/Apache2/Log/Apache2__Log.h (-2 / +2 lines)
48	s = modperl_global_get_server_rec();	48	s = modperl_global_get_server_rec();
49	}	49	}
50		50
51	if ((lmask == APLOG_DEBUG) && (s->loglevel >= APLOG_DEBUG)) {	51	if ((lmask == APLOG_DEBUG) && (s->log.level >= APLOG_DEBUG)) {
52	COP *cop = PL_curcop;	52	COP *cop = PL_curcop;
53	file = CopFILE(cop); /* (caller)[1] */	53	file = CopFILE(cop); /* (caller)[1] */
54	line = CopLINE(cop); /* (caller)[2] */	54	line = CopLINE(cop); /* (caller)[2] */
55	}	55	}
56		56
57	if ((s->loglevel >= lmask) &&	57	if ((s->log.level >= lmask) &&
58	SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) {	58	SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) {
59	dSP;	59	dSP;
60	ENTER;SAVETMPS;	60	ENTER;SAVETMPS;