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.pet...@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.k...@gmail.com> Sent: Monday, 24 April 2023 18:19 To: Valeria Petrov <valeria.pet...@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....@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.pet...@spinetix.com> > Sent: Monday, 24 April 2023 16:30 > To: openembedded-devel@lists.openembedded.org > Cc: Valeria Petrov <valeria.pet...@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.pet...@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 (#102197): https://lists.openembedded.org/g/openembedded-devel/message/102197 Mute This Topic: https://lists.openembedded.org/mt/98471662/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
