diff mbox series

[meta-oe,master,mickledore,langdale,kirkstone,dunfell] apache2: upgrade 2.4.56 -> 2.4.57

Message ID GV0P278MB037292CCD7795E4475D80CCDF1679@GV0P278MB0372.CHEP278.PROD.OUTLOOK.COM
State New
Headers show
Series [meta-oe,master,mickledore,langdale,kirkstone,dunfell] apache2: upgrade 2.4.56 -> 2.4.57 | expand

Commit Message

Valeria Petrov April 24, 2023, 2:30 p.m. UTC 
Changelog:
Changes with Apache 2.4.57

  *) mod_proxy: Check before forwarding that a nocanon path has not been
     rewritten with spaces during processing.  [Yann Ylavic]

  *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
     double encode encoded slashes in the URL sent by the reverse proxy to the
     backend. [Ruediger Pluem]

  *) mod_http2: fixed a crash during connection termination. See PR 66539.
     [Stefan Eissing]

  *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
     in a question mark. PR66547. [Eric Covener]

  *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
     characters on redirections without the "NE" flag.
     [Yann Ylavic, Eric Covener]

  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
     to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]

  *) mod_mime: Do not match the extention against possible query string
     parameters in case ProxyPass was used with the nocanon option.
     [Ruediger Pluem]

New patch:
0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
---
 ...config9.m4-Add-server-directory-to-i.patch | 31 +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |  3 +-
 2 files changed, 33 insertions(+), 1 deletion(-)  create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => apache2_2.4.57.bb} (98%)

+++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
+++ config9.m4-Add-server-directory-to-i.patch
@@ -0,0 +1,31 @@
+From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
+From: Valeria Petrov <valeria.petrov@spinetix.com>
+Date: Tue, 18 Apr 2023 15:38:53 +0200
+Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory 
+to  include path if mod_rewrite is enabled.
+
+Upstream-Status: Accepted
+[https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7CValeria.Petrov%40spinetix.com%7Cf10f7ec0432b4f0213b008db44975dde%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179189118016079%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=AgfbAoHG4hj%2F9VH1gapiWEqOB8704jdySrtXl08H7Ns%3D&reserved=0.
+apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C01
+%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7C5
+f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknown%
+7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV
+CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2ne
+51BIRcwA%3D&reserved=0]
+
+---
+ modules/mappers/config9.m4 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 
+index 55a97ab993..7120b729b7 100644
+--- a/modules/mappers/config9.m4
++++ b/modules/mappers/config9.m4
+@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to 
+user-specific directories, , , mos  APACHE_MODULE(alias, mapping of 
+requests to different filesystem parts, , , yes) APACHE_MODULE(rewrite, 
+rule based URL manipulation, , , most)
+ 
++if test "x$enable_rewrite" != "xno"; then
++    # mod_rewrite needs test_char.h
++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
++
+ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+ 
+ APACHE_MODPATH_FINISH
+--
+2.25.1
+
--
2.25.1

Comments

Valeria Petrov April 24, 2023, 3:07 p.m. UTC | #1 
Hello,

Sorry for the for any inconvenience caused by my duplicate email. 
Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.

Thank you for your understanding.

Best regards,
Valeria

-----Original Message-----
From: Valeria Petrov <Valeria.Petrov@spinetix.com> 
Sent: Monday, 24 April 2023 16:30
To: openembedded-devel@lists.openembedded.org
Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
Subject: [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57

Changelog:
Changes with Apache 2.4.57

  *) mod_proxy: Check before forwarding that a nocanon path has not been
     rewritten with spaces during processing.  [Yann Ylavic]

  *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
     double encode encoded slashes in the URL sent by the reverse proxy to the
     backend. [Ruediger Pluem]

  *) mod_http2: fixed a crash during connection termination. See PR 66539.
     [Stefan Eissing]

  *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
     in a question mark. PR66547. [Eric Covener]

  *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
     characters on redirections without the "NE" flag.
     [Yann Ylavic, Eric Covener]

  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
     to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]

  *) mod_mime: Do not match the extention against possible query string
     parameters in case ProxyPass was used with the nocanon option.
     [Ruediger Pluem]

New patch:
0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
---
 ...config9.m4-Add-server-directory-to-i.patch | 31 +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |  3 +-
 2 files changed, 33 insertions(+), 1 deletion(-)  create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
 rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => apache2_2.4.57.bb} (98%)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
new file mode 100644
index 000000000..996eabf58
--- /dev/null
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
+++ config9.m4-Add-server-directory-to-i.patch
@@ -0,0 +1,31 @@
+From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
+From: Valeria Petrov <valeria.petrov@spinetix.com>
+Date: Tue, 18 Apr 2023 15:38:53 +0200
+Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory 
+to  include path if mod_rewrite is enabled.
+
+Upstream-Status: Accepted
+[https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7CValeria.Petrov%40spinetix.com%7C6df3342ffb304b51c12008db44d06545%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179434059448775%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Icjd5JGgrEepxtMbJi13VCfQon2sI6LyM64Wm6C6%2Bl4%3D&reserved=0.
+apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C01
+%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7C5
+f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknown%
+7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV
+CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2ne
+51BIRcwA%3D&reserved=0]
+
+---
+ modules/mappers/config9.m4 | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 
+index 55a97ab993..7120b729b7 100644
+--- a/modules/mappers/config9.m4
++++ b/modules/mappers/config9.m4
+@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to 
+user-specific directories, , , mos  APACHE_MODULE(alias, mapping of 
+requests to different filesystem parts, , , yes) APACHE_MODULE(rewrite, 
+rule based URL manipulation, , , most)
+ 
++if test "x$enable_rewrite" != "xno"; then
++    # mod_rewrite needs test_char.h
++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
++
+ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+ 
+ APACHE_MODPATH_FINISH
+--
+2.25.1
+
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
similarity index 98%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
index ed5690a4a..669d27756 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
@@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
            file://0007-apache2-allow-to-disable-selinux-support.patch \
            file://0008-Fix-perl-install-directory-to-usr-bin.patch \
            file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
+           
+ file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
+ \
           "
 
 SRC_URI:append:class-target = " \
@@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
            "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
+SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
 
 S = "${WORKDIR}/httpd-${PV}"
 
--
2.25.1
Khem Raj April 24, 2023, 4:19 p.m. UTC | #2 
Hello Valeria

Thanks for your contribution. I tried to apply this patch and it can
not be applied. Perhaps your email agent is not set up correctly or
something. Secondly, the Upstream-Status in the patch
seems to be edited to point to some intermediate URL as well. Please
try to address it and send a v2.

Thanks
-Khem

On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via
lists.openembedded.org
<valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
>
> Hello,
>
> Sorry for the for any inconvenience caused by my duplicate email.
> Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
>
> Thank you for your understanding.
>
> Best regards,
> Valeria
>
> -----Original Message-----
> From: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Sent: Monday, 24 April 2023 16:30
> To: openembedded-devel@lists.openembedded.org
> Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Subject: [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Changelog:
> Changes with Apache 2.4.57
>
>   *) mod_proxy: Check before forwarding that a nocanon path has not been
>      rewritten with spaces during processing.  [Yann Ylavic]
>
>   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
>      double encode encoded slashes in the URL sent by the reverse proxy to the
>      backend. [Ruediger Pluem]
>
>   *) mod_http2: fixed a crash during connection termination. See PR 66539.
>      [Stefan Eissing]
>
>   *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
>      in a question mark. PR66547. [Eric Covener]
>
>   *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
>      characters on redirections without the "NE" flag.
>      [Yann Ylavic, Eric Covener]
>
>   *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
>      to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]
>
>   *) mod_mime: Do not match the extention against possible query string
>      parameters in case ProxyPass was used with the nocanon option.
>      [Ruediger Pluem]
>
> New patch:
> 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
> ---
>  ...config9.m4-Add-server-directory-to-i.patch | 31 +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |  3 +-
>  2 files changed, 33 insertions(+), 1 deletion(-)  create mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
>  rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => apache2_2.4.57.bb} (98%)
>
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> new file mode 100644
> index 000000000..996eabf58
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
> +++ config9.m4-Add-server-directory-to-i.patch
> @@ -0,0 +1,31 @@
> +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001
> +From: Valeria Petrov <valeria.petrov@spinetix.com>
> +Date: Tue, 18 Apr 2023 15:38:53 +0200
> +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory
> +to  include path if mod_rewrite is enabled.
> +
> +Upstream-Status: Accepted
> +[https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7CValeria.Petrov%40spinetix.com%7C6df3342ffb304b51c12008db44d06545%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179434059448775%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Icjd5JGgrEepxtMbJi13VCfQon2sI6LyM64Wm6C6%2Bl4%3D&reserved=0.
> +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C01
> +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7C5
> +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknown%
> +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV
> +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2ne
> +51BIRcwA%3D&reserved=0]
> +
> +---
> + modules/mappers/config9.m4 | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
> +index 55a97ab993..7120b729b7 100644
> +--- a/modules/mappers/config9.m4
> ++++ b/modules/mappers/config9.m4
> +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
> +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
> +requests to different filesystem parts, , , yes) APACHE_MODULE(rewrite,
> +rule based URL manipulation, , , most)
> +
> ++if test "x$enable_rewrite" != "xno"; then
> ++    # mod_rewrite needs test_char.h
> ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
> ++
> + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
> +
> + APACHE_MODPATH_FINISH
> +--
> +2.25.1
> +
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> similarity index 98%
> rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> index ed5690a4a..669d27756 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>             file://0007-apache2-allow-to-disable-selinux-support.patch \
>             file://0008-Fix-perl-install-directory-to-usr-bin.patch \
>             file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
> +
> + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> + \
>            "
>
>  SRC_URI:append:class-target = " \
> @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
>             "
>
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
> -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
> +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
>
>  S = "${WORKDIR}/httpd-${PV}"
>
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102182): https://lists.openembedded.org/g/openembedded-devel/message/102182
> Mute This Topic: https://lists.openembedded.org/mt/98471662/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Valeria Petrov April 25, 2023, 9:57 a.m. UTC | #3 
Hello Khem,

Thank you for your response.

Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems. 

However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
https://patchwork.yoctoproject.org/project/oe/patch/20230419133608.21415-1-valeria.petrov@spinetix.com/

Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.

Please let me know if you if you have the same problems with this one.

Thank you for your understanding and apologies for any confusion caused.

Best regards,
Valeria


-----Original Message-----
From: Khem Raj <raj.khem@gmail.com> 
Sent: Monday, 24 April 2023 18:19
To: Valeria Petrov <Valeria.Petrov@spinetix.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57

Hello Valeria

Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.

Thanks
-Khem

On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
>
> Hello,
>
> Sorry for the for any inconvenience caused by my duplicate email.
> Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
>
> Thank you for your understanding.
>
> Best regards,
> Valeria
>
> -----Original Message-----
> From: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Sent: Monday, 24 April 2023 16:30
> To: openembedded-devel@lists.openembedded.org
> Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Subject: 
> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] 
> apache2: upgrade 2.4.56 -> 2.4.57
>
> Changelog:
> Changes with Apache 2.4.57
>
>   *) mod_proxy: Check before forwarding that a nocanon path has not been
>      rewritten with spaces during processing.  [Yann Ylavic]
>
>   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
>      double encode encoded slashes in the URL sent by the reverse proxy to the
>      backend. [Ruediger Pluem]
>
>   *) mod_http2: fixed a crash during connection termination. See PR 66539.
>      [Stefan Eissing]
>
>   *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
>      in a question mark. PR66547. [Eric Covener]
>
>   *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
>      characters on redirections without the "NE" flag.
>      [Yann Ylavic, Eric Covener]
>
>   *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
>      to the origin server, when using mapping=encoded|servlet.  [Yann 
> Ylavic]
>
>   *) mod_mime: Do not match the extention against possible query string
>      parameters in case ProxyPass was used with the nocanon option.
>      [Ruediger Pluem]
>
> New patch:
> 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
> ---
>  ...config9.m4-Add-server-directory-to-i.patch | 31 
> +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |  
> 3 +-
>  2 files changed, 33 insertions(+), 1 deletion(-)  create mode 100644 
> meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-conf
> ig9.m4-Add-server-directory-to-i.patch
>  rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => 
> apache2_2.4.57.bb} (98%)
>
> diff --git 
> a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> nfig9.m4-Add-server-directory-to-i.patch 
> b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> nfig9.m4-Add-server-directory-to-i.patch
> new file mode 100644
> index 000000000..996eabf58
> --- /dev/null
> +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapper
> +++ s- config9.m4-Add-server-directory-to-i.patch
> @@ -0,0 +1,31 @@
> +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 
> +2001
> +From: Valeria Petrov <valeria.petrov@spinetix.com>
> +Date: Tue, 18 Apr 2023 15:38:53 +0200
> +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory 
> +to  include path if mod_rewrite is enabled.
> +
> +Upstream-Status: Accepted
> +[https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7Cvaleria.petrov%40spinetix.com%7C0f09fbe9c0374ced402d08db44dfaf43%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179499738710066%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=rbE4pwjYo%2FhH%2BPR8QyrnSkYkyuRQItudgM6VB5fs4EQ%3D&reserved=0.
> +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C
> +01
> +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7
> +C5 
> +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknow
> +n% 
> +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJ
> +XV 
> +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2
> +ne
> +51BIRcwA%3D&reserved=0]
> +
> +---
> + modules/mappers/config9.m4 | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 
> +index 55a97ab993..7120b729b7 100644
> +--- a/modules/mappers/config9.m4
> ++++ b/modules/mappers/config9.m4
> +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to 
> +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of 
> +requests to different filesystem parts, , , yes) 
> +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
> +
> ++if test "x$enable_rewrite" != "xno"; then
> ++    # mod_rewrite needs test_char.h
> ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
> ++
> + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
> +
> + APACHE_MODPATH_FINISH
> +--
> +2.25.1
> +
> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb 
> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> similarity index 98%
> rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> index ed5690a4a..669d27756 100644
> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>             file://0007-apache2-allow-to-disable-selinux-support.patch \
>             file://0008-Fix-perl-install-directory-to-usr-bin.patch \
>             
> file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
> +
> + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.pat
> + ch
> + \
>            "
>
>  SRC_URI:append:class-target = " \
> @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
>             "
>
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
> -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
> +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
>
>  S = "${WORKDIR}/httpd-${PV}"
>
> --
> 2.25.1
>
>
> 
>
Khem Raj April 25, 2023, 3:22 p.m. UTC | #4 
Thanks, The patch still would not apply cleanly on master-next, I have
manually fixed the conflicts and staged it on master-next this time.
See
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0b9305faa29f6e26871e7662391efbaae4ae92d9

I see that it is missing Signed-off-by from the submitter as well, so
in future keep that in mind. You can send a v3 with this. Or I can
also add your sign-off to existing patch if
you approve of it. Also read through below it is helpful in submission stuff.

https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov
<Valeria.Petrov@spinetix.com> wrote:
>
> Hello Khem,
>
> Thank you for your response.
>
> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>
> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
> https://patchwork.yoctoproject.org/project/oe/patch/20230419133608.21415-1-valeria.petrov@spinetix.com/
>
> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>
> Please let me know if you if you have the same problems with this one.
>
> Thank you for your understanding and apologies for any confusion caused.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, 24 April 2023 18:19
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Hello Valeria
>
> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>
> Thanks
> -Khem
>
> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
> >
> > Hello,
> >
> > Sorry for the for any inconvenience caused by my duplicate email.
> > Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
> >
> > Thank you for your understanding.
> >
> > Best regards,
> > Valeria
> >
> > -----Original Message-----
> > From: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Sent: Monday, 24 April 2023 16:30
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Subject:
> > [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
> > apache2: upgrade 2.4.56 -> 2.4.57
> >
> > Changelog:
> > Changes with Apache 2.4.57
> >
> >   *) mod_proxy: Check before forwarding that a nocanon path has not been
> >      rewritten with spaces during processing.  [Yann Ylavic]
> >
> >   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
> >      double encode encoded slashes in the URL sent by the reverse proxy to the
> >      backend. [Ruediger Pluem]
> >
> >   *) mod_http2: fixed a crash during connection termination. See PR 66539.
> >      [Stefan Eissing]
> >
> >   *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
> >      in a question mark. PR66547. [Eric Covener]
> >
> >   *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
> >      characters on redirections without the "NE" flag.
> >      [Yann Ylavic, Eric Covener]
> >
> >   *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
> >      to the origin server, when using mapping=encoded|servlet.  [Yann
> > Ylavic]
> >
> >   *) mod_mime: Do not match the extention against possible query string
> >      parameters in case ProxyPass was used with the nocanon option.
> >      [Ruediger Pluem]
> >
> > New patch:
> > 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> > Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
> > ---
> >  ...config9.m4-Add-server-directory-to-i.patch | 31
> > +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
> > 3 +-
> >  2 files changed, 33 insertions(+), 1 deletion(-)  create mode 100644
> > meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-conf
> > ig9.m4-Add-server-directory-to-i.patch
> >  rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb =>
> > apache2_2.4.57.bb} (98%)
> >
> > diff --git
> > a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> > nfig9.m4-Add-server-directory-to-i.patch
> > b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> > nfig9.m4-Add-server-directory-to-i.patch
> > new file mode 100644
> > index 000000000..996eabf58
> > --- /dev/null
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapper
> > +++ s- config9.m4-Add-server-directory-to-i.patch
> > @@ -0,0 +1,31 @@
> > +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
> > +2001
> > +From: Valeria Petrov <valeria.petrov@spinetix.com>
> > +Date: Tue, 18 Apr 2023 15:38:53 +0200
> > +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory
> > +to  include path if mod_rewrite is enabled.
> > +
> > +Upstream-Status: Accepted
> > +[https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsvn%2F&data=05%7C01%7Cvaleria.petrov%40spinetix.com%7C0f09fbe9c0374ced402d08db44dfaf43%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179499738710066%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=rbE4pwjYo%2FhH%2BPR8QyrnSkYkyuRQItudgM6VB5fs4EQ%3D&reserved=0.
> > +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%7C
> > +01
> > +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b%7
> > +C5
> > +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnknow
> > +n%
> > +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJ
> > +XV
> > +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1l2
> > +ne
> > +51BIRcwA%3D&reserved=0]
> > +
> > +---
> > + modules/mappers/config9.m4 | 5 +++++
> > + 1 file changed, 5 insertions(+)
> > +
> > +diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
> > +index 55a97ab993..7120b729b7 100644
> > +--- a/modules/mappers/config9.m4
> > ++++ b/modules/mappers/config9.m4
> > +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
> > +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
> > +requests to different filesystem parts, , , yes)
> > +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
> > +
> > ++if test "x$enable_rewrite" != "xno"; then
> > ++    # mod_rewrite needs test_char.h
> > ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
> > ++
> > + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
> > +
> > + APACHE_MODPATH_FINISH
> > +--
> > +2.25.1
> > +
> > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > similarity index 98%
> > rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > index ed5690a4a..669d27756 100644
> > --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
> >             file://0007-apache2-allow-to-disable-selinux-support.patch \
> >             file://0008-Fix-perl-install-directory-to-usr-bin.patch \
> >
> > file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
> > +
> > + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.pat
> > + ch
> > + \
> >            "
> >
> >  SRC_URI:append:class-target = " \
> > @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
> >             "
> >
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
> > -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
> > +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
> >
> >  S = "${WORKDIR}/httpd-${PV}"
> >
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#102182):
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
> > s.openembedded.org%2Fg%2Fopenembedded-devel%2Fmessage%2F102182&data=05
> > %7C01%7Cvaleria.petrov%40spinetix.com%7C0f09fbe9c0374ced402d08db44dfaf
> > 43%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638179499738710066%7CU
> > nknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1ha
> > WwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=QtSzHsPeMyIRfMR96OfzKmzVBOdZi%
> > 2F72qa33rO8qO%2FA%3D&reserved=0 Mute This Topic:
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
> > s.openembedded.org%2Fmt%2F98471662%2F1997914&data=05%7C01%7Cvaleria.pe
> > trov%40spinetix.com%7C0f09fbe9c0374ced402d08db44dfaf43%7C5f4034faed2d4
> > 840a93facb1e9633b93%7C0%7C0%7C638179499738710066%7CUnknown%7CTWFpbGZsb
> > 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%
> > 7C3000%7C%7C%7C&sdata=Pv%2BW8M0XwqJpzrLpAJImeTOfX%2Fz7HUaFJptqjWVHn8U%
> > 3D&reserved=0 Group Owner:
> > openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe:
> > https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
> > s.openembedded.org%2Fg%2Fopenembedded-devel%2Funsub&data=05%7C01%7Cval
> > eria.petrov%40spinetix.com%7C0f09fbe9c0374ced402d08db44dfaf43%7C5f4034
> > faed2d4840a93facb1e9633b93%7C0%7C0%7C638179499738710066%7CUnknown%7CTW
> > FpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6
> > Mn0%3D%7C3000%7C%7C%7C&sdata=1fmGiVvzssK9kBhj3Ax8Y7QcZhca0spDKlJJS92tb
> > GQ%3D&reserved=0 [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
Valeria Petrov April 25, 2023, 3:45 p.m. UTC | #5 
Khem,

Thank you for your correction.
You can put the Signed-off-by on my behalf.

But if you prefer or if it's better, know that I can always send the patch properly.
Thank you also for the link, I will take into account your advice for the next time.

Have a nice day.

Best regards,
Valeria


-----Original Message-----
From: Khem Raj <raj.khem@gmail.com>
Sent: Tuesday, 25 April 2023 17:22
To: Valeria Petrov <Valeria.Petrov@spinetix.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57

Thanks, The patch still would not apply cleanly on master-next, I have manually fixed the conflicts and staged it on master-next this time.
See
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0b9305faa29f6e26871e7662391efbaae4ae92d9

I see that it is missing Signed-off-by from the submitter as well, so in future keep that in mind. You can send a v3 with this. Or I can also add your sign-off to existing patch if you approve of it. Also read through below it is helpful in submission stuff.

https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov <Valeria.Petrov@spinetix.com> wrote:
>
> Hello Khem,
>
> Thank you for your response.
>
> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>
> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
> https://patc/
> hwork.yoctoproject.org%2Fproject%2Foe%2Fpatch%2F20230419133608.21415-1
> -valeria.petrov%40spinetix.com%2F&data=05%7C01%7CValeria.Petrov%40spin
> etix.com%7C48411cc8c146493f24ff08db45a0ed8d%7C5f4034faed2d4840a93facb1
> e9633b93%7C0%7C0%7C638180329707265315%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7
> C%7C&sdata=0um7yv%2FSR8a2EDdBXB2eG5gXrA2Glnu0Z7%2BPjhOJnps%3D&reserved
> =0
>
> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>
> Please let me know if you if you have the same problems with this one.
>
> Thank you for your understanding and apologies for any confusion caused.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, 24 April 2023 18:19
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe]
> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
> apache2: upgrade 2.4.56 -> 2.4.57
>
> Hello Valeria
>
> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>
> Thanks
> -Khem
>
> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
> >
> > Hello,
> >
> > Sorry for the for any inconvenience caused by my duplicate email.
> > Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
> >
> > Thank you for your understanding.
> >
> > Best regards,
> > Valeria
> >
> > -----Original Message-----
> > From: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Sent: Monday, 24 April 2023 16:30
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Subject:
> > [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
> > apache2: upgrade 2.4.56 -> 2.4.57
> >
> > Changelog:
> > Changes with Apache 2.4.57
> >
> >   *) mod_proxy: Check before forwarding that a nocanon path has not been
> >      rewritten with spaces during processing.  [Yann Ylavic]
> >
> >   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
> >      double encode encoded slashes in the URL sent by the reverse proxy to the
> >      backend. [Ruediger Pluem]
> >
> >   *) mod_http2: fixed a crash during connection termination. See PR 66539.
> >      [Stefan Eissing]
> >
> >   *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
> >      in a question mark. PR66547. [Eric Covener]
> >
> >   *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
> >      characters on redirections without the "NE" flag.
> >      [Yann Ylavic, Eric Covener]
> >
> >   *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
> >      to the origin server, when using mapping=encoded|servlet.
> > [Yann Ylavic]
> >
> >   *) mod_mime: Do not match the extention against possible query string
> >      parameters in case ProxyPass was used with the nocanon option.
> >      [Ruediger Pluem]
> >
> > New patch:
> > 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> > Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
> > ---
> >  ...config9.m4-Add-server-directory-to-i.patch | 31
> > +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
> > 3 +-
> >  2 files changed, 33 insertions(+), 1 deletion(-)  create mode
> > 100644
> > meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> > nf ig9.m4-Add-server-directory-to-i.patch
> >  rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb =>
> > apache2_2.4.57.bb} (98%)
> >
> > diff --git
> > a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
> > co nfig9.m4-Add-server-directory-to-i.patch
> > b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
> > co nfig9.m4-Add-server-directory-to-i.patch
> > new file mode 100644
> > index 000000000..996eabf58
> > --- /dev/null
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapp
> > +++ er
> > +++ s- config9.m4-Add-server-directory-to-i.patch
> > @@ -0,0 +1,31 @@
> > +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
> > +2001
> > +From: Valeria Petrov <valeria.petrov@spinetix.com>
> > +Date: Tue, 18 Apr 2023 15:38:53 +0200
> > +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server'
> > +directory to  include path if mod_rewrite is enabled.
> > +
> > +Upstream-Status: Accepted
> > +[https://svn/.
> > +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%
> > +7C
> > +01
> > +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b
> > +%7
> > +C5
> > +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnkn
> > +ow
> > +n%
> > +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
> > +CJ
> > +XV
> > +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1
> > +l2
> > +ne
> > +51BIRcwA%3D&reserved=0]
> > +
> > +---
> > + modules/mappers/config9.m4 | 5 +++++
> > + 1 file changed, 5 insertions(+)
> > +
> > +diff --git a/modules/mappers/config9.m4
> > +b/modules/mappers/config9.m4 index 55a97ab993..7120b729b7 100644
> > +--- a/modules/mappers/config9.m4
> > ++++ b/modules/mappers/config9.m4
> > +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
> > +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
> > +requests to different filesystem parts, , , yes)
> > +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
> > +
> > ++if test "x$enable_rewrite" != "xno"; then
> > ++    # mod_rewrite needs test_char.h
> > ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
> > ++
> > + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
> > +
> > + APACHE_MODPATH_FINISH
> > +--
> > +2.25.1
> > +
> > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > similarity index 98%
> > rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > index ed5690a4a..669d27756 100644
> > --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
> >             file://0007-apache2-allow-to-disable-selinux-support.patch \
> >             file://0008-Fix-perl-install-directory-to-usr-bin.patch
> > \
> >
> > file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
> > +
> > + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.p
> > + at
> > + ch
> > + \
> >            "
> >
> >  SRC_URI:append:class-target = " \
> > @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
> >             "
> >
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
> > -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
> > +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
> >
> >  S = "${WORKDIR}/httpd-${PV}"
> >
> > --
> > 2.25.1
> >
> >
> > 
> >
Valeria Petrov May 9, 2023, 2:12 p.m. UTC | #6 
Ping.

Thanks,

-----Original Message-----
From: Valeria Petrov
Sent: Tuesday, 25 April 2023 17:45
To: Khem Raj <raj.khem@gmail.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: RE: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57

Khem,

Thank you for your correction.
You can put the Signed-off-by on my behalf.

But if you prefer or if it's better, know that I can always send the patch properly.
Thank you also for the link, I will take into account your advice for the next time.

Have a nice day.

Best regards,
Valeria


-----Original Message-----
From: Khem Raj <raj.khem@gmail.com>
Sent: Tuesday, 25 April 2023 17:22
To: Valeria Petrov <Valeria.Petrov@spinetix.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57

Thanks, The patch still would not apply cleanly on master-next, I have manually fixed the conflicts and staged it on master-next this time.
See
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0b9305faa29f6e26871e7662391efbaae4ae92d9

I see that it is missing Signed-off-by from the submitter as well, so in future keep that in mind. You can send a v3 with this. Or I can also add your sign-off to existing patch if you approve of it. Also read through below it is helpful in submission stuff.

https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov <Valeria.Petrov@spinetix.com> wrote:
>
> Hello Khem,
>
> Thank you for your response.
>
> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>
> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
> https://patc/
> hwork.yoctoproject.org%2Fproject%2Foe%2Fpatch%2F20230419133608.21415-1
> -valeria.petrov%40spinetix.com%2F&data=05%7C01%7CValeria.Petrov%40spin
> etix.com%7C48411cc8c146493f24ff08db45a0ed8d%7C5f4034faed2d4840a93facb1
> e9633b93%7C0%7C0%7C638180329707265315%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7
> C%7C&sdata=0um7yv%2FSR8a2EDdBXB2eG5gXrA2Glnu0Z7%2BPjhOJnps%3D&reserved
> =0
>
> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>
> Please let me know if you if you have the same problems with this one.
>
> Thank you for your understanding and apologies for any confusion caused.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, 24 April 2023 18:19
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe]
> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
> apache2: upgrade 2.4.56 -> 2.4.57
>
> Hello Valeria
>
> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>
> Thanks
> -Khem
>
> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
> >
> > Hello,
> >
> > Sorry for the for any inconvenience caused by my duplicate email.
> > Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
> >
> > Thank you for your understanding.
> >
> > Best regards,
> > Valeria
> >
> > -----Original Message-----
> > From: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Sent: Monday, 24 April 2023 16:30
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
> > Subject:
> > [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
> > apache2: upgrade 2.4.56 -> 2.4.57
> >
> > Changelog:
> > Changes with Apache 2.4.57
> >
> >   *) mod_proxy: Check before forwarding that a nocanon path has not been
> >      rewritten with spaces during processing.  [Yann Ylavic]
> >
> >   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
> >      double encode encoded slashes in the URL sent by the reverse proxy to the
> >      backend. [Ruediger Pluem]
> >
> >   *) mod_http2: fixed a crash during connection termination. See PR 66539.
> >      [Stefan Eissing]
> >
> >   *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
> >      in a question mark. PR66547. [Eric Covener]
> >
> >   *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
> >      characters on redirections without the "NE" flag.
> >      [Yann Ylavic, Eric Covener]
> >
> >   *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
> >      to the origin server, when using mapping=encoded|servlet.
> > [Yann Ylavic]
> >
> >   *) mod_mime: Do not match the extention against possible query string
> >      parameters in case ProxyPass was used with the nocanon option.
> >      [Ruediger Pluem]
> >
> > New patch:
> > 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
> > Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
> > ---
> >  ...config9.m4-Add-server-directory-to-i.patch | 31
> > +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
> > 3 +-
> >  2 files changed, 33 insertions(+), 1 deletion(-)  create mode
> > 100644
> > meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
> > nf ig9.m4-Add-server-directory-to-i.patch
> >  rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb =>
> > apache2_2.4.57.bb} (98%)
> >
> > diff --git
> > a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
> > co nfig9.m4-Add-server-directory-to-i.patch
> > b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
> > co nfig9.m4-Add-server-directory-to-i.patch
> > new file mode 100644
> > index 000000000..996eabf58
> > --- /dev/null
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapp
> > +++ er
> > +++ s- config9.m4-Add-server-directory-to-i.patch
> > @@ -0,0 +1,31 @@
> > +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
> > +2001
> > +From: Valeria Petrov <valeria.petrov@spinetix.com>
> > +Date: Tue, 18 Apr 2023 15:38:53 +0200
> > +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server'
> > +directory to  include path if mod_rewrite is enabled.
> > +
> > +Upstream-Status: Accepted
> > +[https://svn/.
> > +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%
> > +7C
> > +01
> > +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b
> > +%7
> > +C5
> > +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnkn
> > +ow
> > +n%
> > +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
> > +CJ
> > +XV
> > +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1
> > +l2
> > +ne
> > +51BIRcwA%3D&reserved=0]
> > +
> > +---
> > + modules/mappers/config9.m4 | 5 +++++
> > + 1 file changed, 5 insertions(+)
> > +
> > +diff --git a/modules/mappers/config9.m4
> > +b/modules/mappers/config9.m4 index 55a97ab993..7120b729b7 100644
> > +--- a/modules/mappers/config9.m4
> > ++++ b/modules/mappers/config9.m4
> > +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
> > +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
> > +requests to different filesystem parts, , , yes)
> > +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
> > +
> > ++if test "x$enable_rewrite" != "xno"; then
> > ++    # mod_rewrite needs test_char.h
> > ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
> > ++
> > + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
> > +
> > + APACHE_MODPATH_FINISH
> > +--
> > +2.25.1
> > +
> > diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > similarity index 98%
> > rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > index ed5690a4a..669d27756 100644
> > --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
> > +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
> > @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
> >             file://0007-apache2-allow-to-disable-selinux-support.patch \
> >             file://0008-Fix-perl-install-directory-to-usr-bin.patch
> > \
> >
> > file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
> > +
> > + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.p
> > + at
> > + ch
> > + \
> >            "
> >
> >  SRC_URI:append:class-target = " \
> > @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
> >             "
> >
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
> > -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
> > +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
> >
> >  S = "${WORKDIR}/httpd-${PV}"
> >
> > --
> > 2.25.1
> >
> >
> > 
> >
akuster808 May 10, 2023, 1:44 p.m. UTC | #7 
On 5/9/23 10:12 AM, Valeria Petrov via lists.openembedded.org wrote:
> Ping.

for which branch? Langdale just landed the other should follow in do course.

- armin


>
> Thanks,
>
> -----Original Message-----
> From: Valeria Petrov
> Sent: Tuesday, 25 April 2023 17:45
> To: Khem Raj <raj.khem@gmail.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: RE: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Khem,
>
> Thank you for your correction.
> You can put the Signed-off-by on my behalf.
>
> But if you prefer or if it's better, know that I can always send the patch properly.
> Thank you also for the link, I will take into account your advice for the next time.
>
> Have a nice day.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Tuesday, 25 April 2023 17:22
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Thanks, The patch still would not apply cleanly on master-next, I have manually fixed the conflicts and staged it on master-next this time.
> See
> https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0b9305faa29f6e26871e7662391efbaae4ae92d9
>
> I see that it is missing Signed-off-by from the submitter as well, so in future keep that in mind. You can send a v3 with this. Or I can also add your sign-off to existing patch if you approve of it. Also read through below it is helpful in submission stuff.
>
> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
>
> On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov <Valeria.Petrov@spinetix.com> wrote:
>> Hello Khem,
>>
>> Thank you for your response.
>>
>> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>>
>> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
>> https://patc/
>> hwork.yoctoproject.org%2Fproject%2Foe%2Fpatch%2F20230419133608.21415-1
>> -valeria.petrov%40spinetix.com%2F&data=05%7C01%7CValeria.Petrov%40spin
>> etix.com%7C48411cc8c146493f24ff08db45a0ed8d%7C5f4034faed2d4840a93facb1
>> e9633b93%7C0%7C0%7C638180329707265315%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
>> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7
>> C%7C&sdata=0um7yv%2FSR8a2EDdBXB2eG5gXrA2Glnu0Z7%2BPjhOJnps%3D&reserved
>> =0
>>
>> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>>
>> Please let me know if you if you have the same problems with this one.
>>
>> Thank you for your understanding and apologies for any confusion caused.
>>
>> Best regards,
>> Valeria
>>
>>
>> -----Original Message-----
>> From: Khem Raj <raj.khem@gmail.com>
>> Sent: Monday, 24 April 2023 18:19
>> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
>> Cc: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe]
>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>> apache2: upgrade 2.4.56 -> 2.4.57
>>
>> Hello Valeria
>>
>> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>>
>> Thanks
>> -Khem
>>
>> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
>>> Hello,
>>>
>>> Sorry for the for any inconvenience caused by my duplicate email.
>>> Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
>>>
>>> Thank you for your understanding.
>>>
>>> Best regards,
>>> Valeria
>>>
>>> -----Original Message-----
>>> From: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Sent: Monday, 24 April 2023 16:30
>>> To: openembedded-devel@lists.openembedded.org
>>> Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Subject:
>>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>>> apache2: upgrade 2.4.56 -> 2.4.57
>>>
>>> Changelog:
>>> Changes with Apache 2.4.57
>>>
>>>    *) mod_proxy: Check before forwarding that a nocanon path has not been
>>>       rewritten with spaces during processing.  [Yann Ylavic]
>>>
>>>    *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
>>>       double encode encoded slashes in the URL sent by the reverse proxy to the
>>>       backend. [Ruediger Pluem]
>>>
>>>    *) mod_http2: fixed a crash during connection termination. See PR 66539.
>>>       [Stefan Eissing]
>>>
>>>    *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
>>>       in a question mark. PR66547. [Eric Covener]
>>>
>>>    *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
>>>       characters on redirections without the "NE" flag.
>>>       [Yann Ylavic, Eric Covener]
>>>
>>>    *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
>>>       to the origin server, when using mapping=encoded|servlet.
>>> [Yann Ylavic]
>>>
>>>    *) mod_mime: Do not match the extention against possible query string
>>>       parameters in case ProxyPass was used with the nocanon option.
>>>       [Ruediger Pluem]
>>>
>>> New patch:
>>> 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
>>> Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
>>> ---
>>>   ...config9.m4-Add-server-directory-to-i.patch | 31
>>> +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
>>> 3 +-
>>>   2 files changed, 33 insertions(+), 1 deletion(-)  create mode
>>> 100644
>>> meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
>>> nf ig9.m4-Add-server-directory-to-i.patch
>>>   rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb =>
>>> apache2_2.4.57.bb} (98%)
>>>
>>> diff --git
>>> a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> new file mode 100644
>>> index 000000000..996eabf58
>>> --- /dev/null
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapp
>>> +++ er
>>> +++ s- config9.m4-Add-server-directory-to-i.patch
>>> @@ -0,0 +1,31 @@
>>> +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
>>> +2001
>>> +From: Valeria Petrov <valeria.petrov@spinetix.com>
>>> +Date: Tue, 18 Apr 2023 15:38:53 +0200
>>> +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server'
>>> +directory to  include path if mod_rewrite is enabled.
>>> +
>>> +Upstream-Status: Accepted
>>> +[https://svn/.
>>> +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%
>>> +7C
>>> +01
>>> +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b
>>> +%7
>>> +C5
>>> +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnkn
>>> +ow
>>> +n%
>>> +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
>>> +CJ
>>> +XV
>>> +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1
>>> +l2
>>> +ne
>>> +51BIRcwA%3D&reserved=0]
>>> +
>>> +---
>>> + modules/mappers/config9.m4 | 5 +++++
>>> + 1 file changed, 5 insertions(+)
>>> +
>>> +diff --git a/modules/mappers/config9.m4
>>> +b/modules/mappers/config9.m4 index 55a97ab993..7120b729b7 100644
>>> +--- a/modules/mappers/config9.m4
>>> ++++ b/modules/mappers/config9.m4
>>> +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
>>> +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
>>> +requests to different filesystem parts, , , yes)
>>> +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
>>> +
>>> ++if test "x$enable_rewrite" != "xno"; then
>>> ++    # mod_rewrite needs test_char.h
>>> ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
>>> ++
>>> + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
>>> +
>>> + APACHE_MODPATH_FINISH
>>> +--
>>> +2.25.1
>>> +
>>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> similarity index 98%
>>> rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> index ed5690a4a..669d27756 100644
>>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>>>              file://0007-apache2-allow-to-disable-selinux-support.patch \
>>>              file://0008-Fix-perl-install-directory-to-usr-bin.patch
>>> \
>>>
>>> file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
>>> +
>>> + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.p
>>> + at
>>> + ch
>>> + \
>>>             "
>>>
>>>   SRC_URI:append:class-target = " \
>>> @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
>>>              "
>>>
>>>   LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
>>> -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
>>> +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
>>>
>>>   S = "${WORKDIR}/httpd-${PV}"
>>>
>>> --
>>> 2.25.1
>>>
>>>
>>>
>>>
>>>
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#102512): https://lists.openembedded.org/g/openembedded-devel/message/102512
>>> Mute This Topic: https://lists.openembedded.org/mt/98471662/3616698
>>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
akuster808 May 16, 2023, 11:31 a.m. UTC | #8 
On 5/9/23 10:12 AM, Valeria Petrov via lists.openembedded.org wrote:
> Ping.

Kirkstone  done and dunfell was just requested to be merged.

-armin
>
> Thanks,
>
> -----Original Message-----
> From: Valeria Petrov
> Sent: Tuesday, 25 April 2023 17:45
> To: Khem Raj <raj.khem@gmail.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: RE: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Khem,
>
> Thank you for your correction.
> You can put the Signed-off-by on my behalf.
>
> But if you prefer or if it's better, know that I can always send the patch properly.
> Thank you also for the link, I will take into account your advice for the next time.
>
> Have a nice day.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Tuesday, 25 April 2023 17:22
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57
>
> Thanks, The patch still would not apply cleanly on master-next, I have manually fixed the conflicts and staged it on master-next this time.
> See
> https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=0b9305faa29f6e26871e7662391efbaae4ae92d9
>
> I see that it is missing Signed-off-by from the submitter as well, so in future keep that in mind. You can send a v3 with this. Or I can also add your sign-off to existing patch if you approve of it. Also read through below it is helpful in submission stuff.
>
> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded
>
> On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov <Valeria.Petrov@spinetix.com> wrote:
>> Hello Khem,
>>
>> Thank you for your response.
>>
>> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>>
>> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
>> https://patc/
>> hwork.yoctoproject.org%2Fproject%2Foe%2Fpatch%2F20230419133608.21415-1
>> -valeria.petrov%40spinetix.com%2F&data=05%7C01%7CValeria.Petrov%40spin
>> etix.com%7C48411cc8c146493f24ff08db45a0ed8d%7C5f4034faed2d4840a93facb1
>> e9633b93%7C0%7C0%7C638180329707265315%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
>> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7
>> C%7C&sdata=0um7yv%2FSR8a2EDdBXB2eG5gXrA2Glnu0Z7%2BPjhOJnps%3D&reserved
>> =0
>>
>> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>>
>> Please let me know if you if you have the same problems with this one.
>>
>> Thank you for your understanding and apologies for any confusion caused.
>>
>> Best regards,
>> Valeria
>>
>>
>> -----Original Message-----
>> From: Khem Raj <raj.khem@gmail.com>
>> Sent: Monday, 24 April 2023 18:19
>> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
>> Cc: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe]
>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>> apache2: upgrade 2.4.56 -> 2.4.57
>>
>> Hello Valeria
>>
>> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>>
>> Thanks
>> -Khem
>>
>> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
>>> Hello,
>>>
>>> Sorry for the for any inconvenience caused by my duplicate email.
>>> Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
>>>
>>> Thank you for your understanding.
>>>
>>> Best regards,
>>> Valeria
>>>
>>> -----Original Message-----
>>> From: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Sent: Monday, 24 April 2023 16:30
>>> To: openembedded-devel@lists.openembedded.org
>>> Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Subject:
>>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>>> apache2: upgrade 2.4.56 -> 2.4.57
>>>
>>> Changelog:
>>> Changes with Apache 2.4.57
>>>
>>>    *) mod_proxy: Check before forwarding that a nocanon path has not been
>>>       rewritten with spaces during processing.  [Yann Ylavic]
>>>
>>>    *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
>>>       double encode encoded slashes in the URL sent by the reverse proxy to the
>>>       backend. [Ruediger Pluem]
>>>
>>>    *) mod_http2: fixed a crash during connection termination. See PR 66539.
>>>       [Stefan Eissing]
>>>
>>>    *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
>>>       in a question mark. PR66547. [Eric Covener]
>>>
>>>    *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
>>>       characters on redirections without the "NE" flag.
>>>       [Yann Ylavic, Eric Covener]
>>>
>>>    *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
>>>       to the origin server, when using mapping=encoded|servlet.
>>> [Yann Ylavic]
>>>
>>>    *) mod_mime: Do not match the extention against possible query string
>>>       parameters in case ProxyPass was used with the nocanon option.
>>>       [Ruediger Pluem]
>>>
>>> New patch:
>>> 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
>>> Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
>>> ---
>>>   ...config9.m4-Add-server-directory-to-i.patch | 31
>>> +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
>>> 3 +-
>>>   2 files changed, 33 insertions(+), 1 deletion(-)  create mode
>>> 100644
>>> meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
>>> nf ig9.m4-Add-server-directory-to-i.patch
>>>   rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb =>
>>> apache2_2.4.57.bb} (98%)
>>>
>>> diff --git
>>> a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> new file mode 100644
>>> index 000000000..996eabf58
>>> --- /dev/null
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapp
>>> +++ er
>>> +++ s- config9.m4-Add-server-directory-to-i.patch
>>> @@ -0,0 +1,31 @@
>>> +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
>>> +2001
>>> +From: Valeria Petrov <valeria.petrov@spinetix.com>
>>> +Date: Tue, 18 Apr 2023 15:38:53 +0200
>>> +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server'
>>> +directory to  include path if mod_rewrite is enabled.
>>> +
>>> +Upstream-Status: Accepted
>>> +[https://svn/.
>>> +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%
>>> +7C
>>> +01
>>> +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b
>>> +%7
>>> +C5
>>> +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnkn
>>> +ow
>>> +n%
>>> +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
>>> +CJ
>>> +XV
>>> +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1
>>> +l2
>>> +ne
>>> +51BIRcwA%3D&reserved=0]
>>> +
>>> +---
>>> + modules/mappers/config9.m4 | 5 +++++
>>> + 1 file changed, 5 insertions(+)
>>> +
>>> +diff --git a/modules/mappers/config9.m4
>>> +b/modules/mappers/config9.m4 index 55a97ab993..7120b729b7 100644
>>> +--- a/modules/mappers/config9.m4
>>> ++++ b/modules/mappers/config9.m4
>>> +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to
>>> +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of
>>> +requests to different filesystem parts, , , yes)
>>> +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
>>> +
>>> ++if test "x$enable_rewrite" != "xno"; then
>>> ++    # mod_rewrite needs test_char.h
>>> ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
>>> ++
>>> + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
>>> +
>>> + APACHE_MODPATH_FINISH
>>> +--
>>> +2.25.1
>>> +
>>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> similarity index 98%
>>> rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> index ed5690a4a..669d27756 100644
>>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>>>              file://0007-apache2-allow-to-disable-selinux-support.patch \
>>>              file://0008-Fix-perl-install-directory-to-usr-bin.patch
>>> \
>>>
>>> file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
>>> +
>>> + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.p
>>> + at
>>> + ch
>>> + \
>>>             "
>>>
>>>   SRC_URI:append:class-target = " \
>>> @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
>>>              "
>>>
>>>   LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
>>> -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
>>> +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
>>>
>>>   S = "${WORKDIR}/httpd-${PV}"
>>>
>>> --
>>> 2.25.1
>>>
>>>
>>>
>>>
>>>
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>> Links: You receive all messages sent to this group.
>>> View/Reply Online (#102512): https://lists.openembedded.org/g/openembedded-devel/message/102512
>>> Mute This Topic: https://lists.openembedded.org/mt/98471662/3616698
>>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>
Valeria Petrov May 16, 2023, 2:06 p.m. UTC | #9 
Armin,

Thank you very much.

Best regards,
Valeria

-----Original Message-----
From: akuster808 <akuster808@gmail.com> 
Sent: Tuesday, 16 May 2023 13:32
To: Valeria Petrov <Valeria.Petrov@spinetix.com>; openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] apache2: upgrade 2.4.56 -> 2.4.57




On 5/9/23 10:12 AM, Valeria Petrov via lists.openembedded.org wrote:
> Ping.

Kirkstone  done and dunfell was just requested to be merged.

-armin
>
> Thanks,
>
> -----Original Message-----
> From: Valeria Petrov
> Sent: Tuesday, 25 April 2023 17:45
> To: Khem Raj <raj.khem@gmail.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: RE: [oe] 
> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] 
> apache2: upgrade 2.4.56 -> 2.4.57
>
> Khem,
>
> Thank you for your correction.
> You can put the Signed-off-by on my behalf.
>
> But if you prefer or if it's better, know that I can always send the patch properly.
> Thank you also for the link, I will take into account your advice for the next time.
>
> Have a nice day.
>
> Best regards,
> Valeria
>
>
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Tuesday, 25 April 2023 17:22
> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
> Cc: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] 
> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH] 
> apache2: upgrade 2.4.56 -> 2.4.57
>
> Thanks, The patch still would not apply cleanly on master-next, I have manually fixed the conflicts and staged it on master-next this time.
> See
> https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.
> openembedded.org%2Fmeta-openembedded%2Fcommit%2F%3Fh%3Dmaster-next%26i
> d%3D0b9305faa29f6e26871e7662391efbaae4ae92d9&data=05%7C01%7Cvaleria.pe
> trov%40spinetix.com%7C1bcca90c3df5487109ff08db560120cf%7C5f4034faed2d4
> 840a93facb1e9633b93%7C0%7C0%7C638198335099477219%7CUnknown%7CTWFpbGZsb
> 3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%
> 7C3000%7C%7C%7C&sdata=qTSB0h07dfYqLFYR59d2c9AnqVb5mMvYOfY3gAN803A%3D&r
> eserved=0
>
> I see that it is missing Signed-off-by from the submitter as well, so in future keep that in mind. You can send a v3 with this. Or I can also add your sign-off to existing patch if you approve of it. Also read through below it is helpful in submission stuff.
>
> https://eur02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.
> openembedded.org%2Fwiki%2FHow_to_submit_a_patch_to_OpenEmbedded&data=0
> 5%7C01%7Cvaleria.petrov%40spinetix.com%7C1bcca90c3df5487109ff08db56012
> 0cf%7C5f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638198335099477219%7C
> Unknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1h
> aWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=O%2BxsUU9fiJCewkEJoaKKZrMlPsq
> ZOYuQsp9MVB9ud3o%3D&reserved=0
>
> On Tue, Apr 25, 2023 at 2:57 AM Valeria Petrov <Valeria.Petrov@spinetix.com> wrote:
>> Hello Khem,
>>
>> Thank you for your response.
>>
>> Indeed, I verified the patch from my duplicate mail sent on 2023-04-24 and I found the same problems.
>>
>> However, the correct version of the patch is the one I sent in my first message (on 2023-04-19) to the mailing list, which you can find at the following link:
>> https://patc/
>> hwork.yoctoproject.org%2Fproject%2Foe%2Fpatch%2F20230419133608.21415-
>> 1 
>> -valeria.petrov%40spinetix.com%2F&data=05%7C01%7CValeria.Petrov%40spi
>> n
>> etix.com%7C48411cc8c146493f24ff08db45a0ed8d%7C5f4034faed2d4840a93facb
>> 1 
>> e9633b93%7C0%7C0%7C638180329707265315%7CUnknown%7CTWFpbGZsb3d8eyJWIjo
>> i
>> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%
>> 7 
>> C%7C&sdata=0um7yv%2FSR8a2EDdBXB2eG5gXrA2Glnu0Z7%2BPjhOJnps%3D&reserve
>> d
>> =0
>>
>> Please disregard the two emails I sent on 2023-04-24, as they contain errors. The correct version of the patch is the one I sent on 2023-04-19.
>>
>> Please let me know if you if you have the same problems with this one.
>>
>> Thank you for your understanding and apologies for any confusion caused.
>>
>> Best regards,
>> Valeria
>>
>>
>> -----Original Message-----
>> From: Khem Raj <raj.khem@gmail.com>
>> Sent: Monday, 24 April 2023 18:19
>> To: Valeria Petrov <Valeria.Petrov@spinetix.com>
>> Cc: openembedded-devel@lists.openembedded.org
>> Subject: Re: [oe]
>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>> apache2: upgrade 2.4.56 -> 2.4.57
>>
>> Hello Valeria
>>
>> Thanks for your contribution. I tried to apply this patch and it can not be applied. Perhaps your email agent is not set up correctly or something. Secondly, the Upstream-Status in the patch seems to be edited to point to some intermediate URL as well. Please try to address it and send a v2.
>>
>> Thanks
>> -Khem
>>
>> On Mon, Apr 24, 2023 at 8:13 AM Valeria Petrov via lists.openembedded.org <valeria.petrov=spinetix.com@lists.openembedded.org> wrote:
>>> Hello,
>>>
>>> Sorry for the for any inconvenience caused by my duplicate email.
>>> Unfortunately, it appears that the email got stuck or did not go through due to technical issues, and I was not sure if you received it.
>>>
>>> Thank you for your understanding.
>>>
>>> Best regards,
>>> Valeria
>>>
>>> -----Original Message-----
>>> From: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Sent: Monday, 24 April 2023 16:30
>>> To: openembedded-devel@lists.openembedded.org
>>> Cc: Valeria Petrov <Valeria.Petrov@spinetix.com>
>>> Subject:
>>> [meta-oe][master][mickledore][langdale][kirkstone][dunfell][PATCH]
>>> apache2: upgrade 2.4.56 -> 2.4.57
>>>
>>> Changelog:
>>> Changes with Apache 2.4.57
>>>
>>>    *) mod_proxy: Check before forwarding that a nocanon path has not been
>>>       rewritten with spaces during processing.  [Yann Ylavic]
>>>
>>>    *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
>>>       double encode encoded slashes in the URL sent by the reverse proxy to the
>>>       backend. [Ruediger Pluem]
>>>
>>>    *) mod_http2: fixed a crash during connection termination. See PR 66539.
>>>       [Stefan Eissing]
>>>
>>>    *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
>>>       in a question mark. PR66547. [Eric Covener]
>>>
>>>    *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
>>>       characters on redirections without the "NE" flag.
>>>       [Yann Ylavic, Eric Covener]
>>>
>>>    *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
>>>       to the origin server, when using mapping=encoded|servlet.
>>> [Yann Ylavic]
>>>
>>>    *) mod_mime: Do not match the extention against possible query string
>>>       parameters in case ProxyPass was used with the nocanon option.
>>>       [Ruediger Pluem]
>>>
>>> New patch:
>>> 0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
>>> Accepted in upstream, expected to be removed at next apache2 2.4.58 update.
>>> ---
>>>   ...config9.m4-Add-server-directory-to-i.patch | 31
>>> +++++++++++++++++++  .../{apache2_2.4.56.bb => apache2_2.4.57.bb}  |
>>> 3 +-
>>>   2 files changed, 33 insertions(+), 1 deletion(-)  create mode
>>> 100644
>>> meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-co
>>> nf ig9.m4-Add-server-directory-to-i.patch
>>>   rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.56.bb => 
>>> apache2_2.4.57.bb} (98%)
>>>
>>> diff --git
>>> a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-
>>> co nfig9.m4-Add-server-directory-to-i.patch
>>> new file mode 100644
>>> index 000000000..996eabf58
>>> --- /dev/null
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mapp
>>> +++ er
>>> +++ s- config9.m4-Add-server-directory-to-i.patch
>>> @@ -0,0 +1,31 @@
>>> +From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00
>>> +2001
>>> +From: Valeria Petrov <valeria.petrov@spinetix.com>
>>> +Date: Tue, 18 Apr 2023 15:38:53 +0200
>>> +Subject: [PATCH] * modules/mappers/config9.m4: Add 'server'
>>> +directory to  include path if mod_rewrite is enabled.
>>> +
>>> +Upstream-Status: Accepted
>>> +[https://svn/.
>>> +apache.org%2Fviewvc%3Fview%3Drevision%26revision%3D1909241&data=05%
>>> +7C
>>> +01
>>> +%7Cvaleria.petrov%40spinetix.com%7Cdd425f6a28c44f7070f008db40db139b
>>> +%7
>>> +C5
>>> +f4034faed2d4840a93facb1e9633b93%7C0%7C0%7C638175081881994084%7CUnkn
>>> +ow
>>> +n%
>>> +7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiL
>>> +CJ
>>> +XV
>>> +CI6Mn0%3D%7C3000%7C%7C%7C&sdata=XR38OeEdzVwgIAn0s32t%2F%2BkxnRFiIv1
>>> +l2
>>> +ne
>>> +51BIRcwA%3D&reserved=0]
>>> +
>>> +---
>>> + modules/mappers/config9.m4 | 5 +++++
>>> + 1 file changed, 5 insertions(+)
>>> +
>>> +diff --git a/modules/mappers/config9.m4
>>> +b/modules/mappers/config9.m4 index 55a97ab993..7120b729b7 100644
>>> +--- a/modules/mappers/config9.m4
>>> ++++ b/modules/mappers/config9.m4
>>> +@@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to 
>>> +user-specific directories, , , mos  APACHE_MODULE(alias, mapping of 
>>> +requests to different filesystem parts, , , yes) 
>>> +APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
>>> +
>>> ++if test "x$enable_rewrite" != "xno"; then
>>> ++    # mod_rewrite needs test_char.h
>>> ++    APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) fi
>>> ++
>>> + APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
>>> +
>>> + APACHE_MODPATH_FINISH
>>> +--
>>> +2.25.1
>>> +
>>> diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> similarity index 98%
>>> rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> index ed5690a4a..669d27756 100644
>>> --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
>>> +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
>>> @@ -15,6 +15,7 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
>>>              file://0007-apache2-allow-to-disable-selinux-support.patch \
>>>              file://0008-Fix-perl-install-directory-to-usr-bin.patch
>>> \
>>>
>>> file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
>>> +
>>> + file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.p
>>> + at
>>> + ch
>>> + \
>>>             "
>>>
>>>   SRC_URI:append:class-target = " \
>>> @@ -26,7 +27,7 @@ SRC_URI:append:class-target = " \
>>>              "
>>>
>>>   LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
>>> -SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
>>> +SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
>>>
>>>   S = "${WORKDIR}/httpd-${PV}"
>>>
>>> --
>>> 2.25.1
>>>
>>>
>>>
>>>
>>>
>>> 
>>>
diff mbox series

Patch

diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
new file mode 100644
index 000000000..996eabf58
--- /dev/null
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
similarity index 98%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
index ed5690a4a..669d27756 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.56.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb
@@ -15,6 +15,7 @@  SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \
            file://0007-apache2-allow-to-disable-selinux-support.patch \
            file://0008-Fix-perl-install-directory-to-usr-bin.patch \
            file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \
+           
+ file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch
+ \
           "
 
 SRC_URI:append:class-target = " \
@@ -26,7 +27,7 @@  SRC_URI:append:class-target = " \
            "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
-SRC_URI[sha256sum] = "d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c"
+SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
 
 S = "${WORKDIR}/httpd-${PV}"