You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@httpd.apache.org by GitBox <gi...@apache.org> on 2021/06/08 16:27:41 UTC
[GitHub] [httpd] jfclere opened a new pull request #194: complete back port the mapping=servlet to 2.4.x
jfclere opened a new pull request #194:
URL: https://github.com/apache/httpd/pull/194
back port list:
r1879074 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879074)
r1879075 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879075)
r1879076 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879076)
r1879077 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879077)
r1879078 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879078)
r1879079 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879079)
r1879080 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879080)
r1879094 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879094)
r1879095 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879095)
r1879110 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879110)
r1879111 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879111)
r1879112 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879112)
r1879114 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879114)
r1879116 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879116)
r1879117 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879117)
r1879137 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879137)
r1879144 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879144)
r1879145 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879145)
r1879147 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879147)
r1879149 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879149)
r1879235 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879235)
r1879360 (https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879360)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r647630072
##########
File path: server/request.c
##########
@@ -157,24 +160,93 @@ AP_DECLARE(int) ap_some_authn_required(request_rec *r)
return rv;
}
+static int walk_location_and_if(request_rec *r)
+{
+ int access_status;
+
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
+ }
+ if ((access_status = ap_if_walk(r))) {
+ return access_status;
+ }
+
+ /* Don't set per-dir loglevel if LogLevelOverride is set */
+ if (!r->connection->log) {
Review comment:
That `if (!r->connection->log)` is from https://github.com/apache/httpd/commit/d04d01c5891a1f0f8fadd5e16f1752b915d2153f which never made it to 2.4.x (AFAICT).
For now it probably should be simply:
```
{
core_dir_config *d...
...
}
```
in 2.4.x (with the unconditional block which aligns with trunk still).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic commented on pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic commented on pull request #194:
URL: https://github.com/apache/httpd/pull/194#issuecomment-995709987
Merged
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] jfclere commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
jfclere commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r655915394
##########
File path: server/request.c
##########
@@ -157,24 +160,93 @@ AP_DECLARE(int) ap_some_authn_required(request_rec *r)
return rv;
}
+static int walk_location_and_if(request_rec *r)
+{
+ int access_status;
+
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
+ }
+ if ((access_status = ap_if_walk(r))) {
+ return access_status;
+ }
+
+ /* Don't set per-dir loglevel if LogLevelOverride is set */
+ if (!r->connection->log) {
Review comment:
fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r647630072
##########
File path: server/request.c
##########
@@ -157,24 +160,93 @@ AP_DECLARE(int) ap_some_authn_required(request_rec *r)
return rv;
}
+static int walk_location_and_if(request_rec *r)
+{
+ int access_status;
+
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
+ }
+ if ((access_status = ap_if_walk(r))) {
+ return access_status;
+ }
+
+ /* Don't set per-dir loglevel if LogLevelOverride is set */
+ if (!r->connection->log) {
Review comment:
That `if (!r->connection->log)` (and comment) is from https://github.com/apache/httpd/commit/d04d01c5891a1f0f8fadd5e16f1752b915d2153f which never made it to 2.4.x (AFAICT).
For now it probably should be simply:
```
{
core_dir_config *d...
...
}
```
in 2.4.x (with the unconditional block which aligns with trunk still).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic closed pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic closed pull request #194:
URL: https://github.com/apache/httpd/pull/194
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] jfclere commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
jfclere commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r648054446
##########
File path: server/request.c
##########
@@ -157,24 +160,93 @@ AP_DECLARE(int) ap_some_authn_required(request_rec *r)
return rv;
}
+static int walk_location_and_if(request_rec *r)
+{
+ int access_status;
+
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
+ }
+ if ((access_status = ap_if_walk(r))) {
+ return access_status;
+ }
+
+ /* Don't set per-dir loglevel if LogLevelOverride is set */
+ if (!r->connection->log) {
Review comment:
OK I will fix that thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic commented on pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic commented on pull request #194:
URL: https://github.com/apache/httpd/pull/194#issuecomment-902692066
Merged to 2.4.x in https://github.com/apache/httpd/commit/6a5d3e006b8dc8aca1a267a8607864e1c3607f61 (r1892161)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] jfclere commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
jfclere commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r655915394
##########
File path: server/request.c
##########
@@ -157,24 +160,93 @@ AP_DECLARE(int) ap_some_authn_required(request_rec *r)
return rv;
}
+static int walk_location_and_if(request_rec *r)
+{
+ int access_status;
+
+ if ((access_status = ap_location_walk(r))) {
+ return access_status;
+ }
+ if ((access_status = ap_if_walk(r))) {
+ return access_status;
+ }
+
+ /* Don't set per-dir loglevel if LogLevelOverride is set */
+ if (!r->connection->log) {
Review comment:
fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org
[GitHub] [httpd] ylavic commented on a change in pull request #194: complete back port the mapping=servlet to 2.4.x
Posted by GitBox <gi...@apache.org>.
ylavic commented on a change in pull request #194:
URL: https://github.com/apache/httpd/pull/194#discussion_r647633183
##########
File path: include/ap_mmn.h
##########
@@ -562,14 +562,18 @@
* 20120211.106 (2.4.49-dev) Add ap_create_request().
* 20120211.107 (2.4.49-dev) Add ap_parse_request_line() and
* ap_check_request_header()
+ * 20120211.108 (2.4.49-dev) Add ap_normalize_path(),
+ * pre_translate_name hook and
+ * Add map_encoded_one and map_encoded_all bits to
+ * proxy_server_conf.
Review comment:
Those were 3 separate MMN minor bumps in trunk, but I suppose that it's OK to merge them if they end up in a single 2.4.x backport..
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org
For additional commands, e-mail: notifications-help@httpd.apache.org