Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 307645 Details for
Bug 410453
www-apache/mod_perl does not build against www-servers/apache2-2.4.1-r2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
mod_perl-2.0.5-r1302463-dirty-hacks-to-build-it.patch
mod_perl-2.0.5-r1302463-dirty-hacks-to-build-it.patch (text/plain), 3.91 KB, created by
Martin Jansa
on 2012-04-03 17:57:58 UTC
(
hide
)
Description:
mod_perl-2.0.5-r1302463-dirty-hacks-to-build-it.patch
Filename:
MIME Type:
Creator:
Martin Jansa
Created:
2012-04-03 17:57:58 UTC
Size:
3.91 KB
patch
obsolete
>From d1d565e2c03ca9277bb5f49638fe0c2655d7ed98 Mon Sep 17 00:00:00 2001 >From: Martin Jansa <Martin.Jansa@gmail.com> >Date: Tue, 3 Apr 2012 19:11:31 +0200 >Subject: [PATCH] dirty hacks to build it > >Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >--- > 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(-) > >diff --git a/src/modules/perl/modperl_apache_compat.h b/src/modules/perl/modperl_apache_compat.h >index 78a9cb3..072ae79 100644 >--- a/src/modules/perl/modperl_apache_compat.h >+++ b/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) > >diff --git a/src/modules/perl/modperl_interp.c b/src/modules/perl/modperl_interp.c >index dfff32e..af08df3 100644 >--- a/src/modules/perl/modperl_interp.c >+++ b/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 */ >diff --git a/src/modules/perl/modperl_module.c b/src/modules/perl/modperl_module.c >index da148ca..f6a18b1 100644 >--- a/src/modules/perl/modperl_module.c >+++ b/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); >diff --git a/xs/Apache2/Log/Apache2__Log.h b/xs/Apache2/Log/Apache2__Log.h >index 1866315..f642a5d 100644 >--- a/xs/Apache2/Log/Apache2__Log.h >+++ b/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; >diff --git a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h b/xs/Apache2/ServerUtil/Apache2__ServerUtil.h >index 7133e07..3bf6ad0 100644 >--- a/xs/Apache2/ServerUtil/Apache2__ServerUtil.h >+++ b/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 >-- >1.7.8.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 410453
:
307641
|
307643
| 307645 |
307647
|
307649
|
307651
|
307653