Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 340390 Details for
Bug 410451
www-servers/apache-2.4.1-r1 APACHE2_MPMS="itk" - configure: error: MPM itk is not supported on this platform.
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
apache-2.4.4-r1388447-dirwalk-stat-hook.diff
apache-2.4.4-r1388447-dirwalk-stat-hook.diff (text/plain), 4.24 KB, created by
Timo Gurr (RETIRED)
on 2013-02-27 17:13:21 UTC
(
hide
)
Description:
apache-2.4.4-r1388447-dirwalk-stat-hook.diff
Filename:
MIME Type:
Creator:
Timo Gurr (RETIRED)
Created:
2013-02-27 17:13:21 UTC
Size:
4.24 KB
patch
obsolete
>diff -ur httpd-2.4.3.orig/include/http_request.h httpd-2.4.3/include/http_request.h >--- httpd-2.4.3.orig/include/http_request.h 2012-11-11 13:19:38.000000000 +0100 >+++ httpd-2.4.3/include/http_request.h 2012-11-11 13:21:35.000000000 +0100 >@@ -538,6 +538,15 @@ > */ > AP_DECLARE_HOOK(int,post_perdir_config,(request_rec *r)) > >+/** >+ * This hook allows modules to handle/emulate the apr_stat() calls >+ * needed for directory walk. >+ * @param r The current request >+ * @return apr_status_t or AP_DECLINED (let later modules decide) >+ * @ingroup hooks >+ */ >+AP_DECLARE_HOOK(apr_status_t,dirwalk_stat,(apr_finfo_t *finfo, request_rec *r, apr_int32_t wanted)) >+ > AP_DECLARE(int) ap_location_walk(request_rec *r); > AP_DECLARE(int) ap_directory_walk(request_rec *r); > AP_DECLARE(int) ap_file_walk(request_rec *r); >diff -ur httpd-2.4.3.orig/server/core.c httpd-2.4.3/server/core.c >--- httpd-2.4.3.orig/server/core.c 2012-08-15 01:59:24.000000000 +0200 >+++ httpd-2.4.3/server/core.c 2012-11-11 13:21:35.000000000 +0100 >@@ -4779,6 +4779,12 @@ > return APR_SUCCESS; > } > >+static apr_status_t core_dirwalk_stat(apr_finfo_t *finfo, request_rec *r, >+ apr_int32_t wanted) >+{ >+ return apr_stat(finfo, r->filename, wanted, r->pool); >+} >+ > static void core_dump_config(apr_pool_t *p, server_rec *s) > { > core_server_config *sconf = ap_get_core_module_config(s->module_config); >@@ -4855,7 +4861,8 @@ > ap_hook_child_status(ap_core_child_status, NULL, NULL, APR_HOOK_MIDDLE); > ap_hook_insert_network_bucket(core_insert_network_bucket, NULL, NULL, > APR_HOOK_REALLY_LAST); >- >+ ap_hook_dirwalk_stat(core_dirwalk_stat, NULL, NULL, APR_HOOK_REALLY_LAST); >+ > /* register the core's insert_filter hook and register core-provided > * filters > */ >diff -ur httpd-2.4.3.orig/server/request.c httpd-2.4.3/server/request.c >--- httpd-2.4.3.orig/server/request.c 2012-11-11 13:19:38.000000000 +0100 >+++ httpd-2.4.3/server/request.c 2012-11-11 13:21:35.000000000 +0100 >@@ -70,6 +70,7 @@ > APR_HOOK_LINK(insert_filter) > APR_HOOK_LINK(create_request) > APR_HOOK_LINK(post_perdir_config) >+ APR_HOOK_LINK(dirwalk_stat) > ) > > AP_IMPLEMENT_HOOK_RUN_FIRST(int,translate_name, >@@ -93,6 +94,9 @@ > (request_rec *r), (r), OK, DECLINED) > AP_IMPLEMENT_HOOK_RUN_ALL(int, post_perdir_config, > (request_rec *r), (r), OK, DECLINED) >+AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t,dirwalk_stat, >+ (apr_finfo_t *finfo, request_rec *r, apr_int32_t wanted), >+ (finfo, r, wanted), AP_DECLINED) > > static int auth_internal_per_conf = 0; > static int auth_internal_per_conf_hooks = 0; >@@ -609,7 +613,7 @@ > * with APR_ENOENT, knowing that the path is good. > */ > if (r->finfo.filetype == APR_NOFILE || r->finfo.filetype == APR_LNK) { >- rv = apr_stat(&r->finfo, r->filename, APR_FINFO_MIN, r->pool); >+ rv = ap_run_dirwalk_stat(&r->finfo, r, APR_FINFO_MIN); > > /* some OSs will return APR_SUCCESS/APR_REG if we stat > * a regular file but we have '/' at the end of the name; >@@ -675,9 +679,8 @@ > * check. > */ > if (!(opts & OPT_SYM_LINKS)) { >- rv = apr_stat(&thisinfo, r->filename, >- APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK, >- r->pool); >+ rv = ap_run_dirwalk_stat(&thisinfo, r, >+ APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK); > /* > * APR_INCOMPLETE is as fine as result as APR_SUCCESS as we > * have added APR_FINFO_NAME to the wanted parameter of >@@ -1092,9 +1095,8 @@ > * the name of its target, if we are fixing the filename > * case/resolving aliases. > */ >- rv = apr_stat(&thisinfo, r->filename, >- APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK, >- r->pool); >+ rv = ap_run_dirwalk_stat(&thisinfo, r, >+ APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK); > > if (APR_STATUS_IS_ENOENT(rv)) { > /* Nothing? That could be nice. But our directory
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 Raw
Actions:
View
Attachments on
bug 410451
:
307383
|
307385
|
307419
|
340382
|
340384
|
340386
|
340388
|
340390
|
340392
|
341226
|
341228
|
354112
|
354114
|
354116
|
370724
|
373014
|
377636
|
377638