From 9b554b9bf6ef8d35208c031610c49f4afbb92394 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 3 Jul 2024 21:19:57 +0000 Subject: [PATCH] Wed Jul 3 21:19:57 UTC 2024 n/httpd-2.4.61-x86_64-1.txz: Upgraded. This update contains the fix for the 2.4.60 regression, which has also been assigned a CVE. We fixed this already, but we'll make it official. For more information, see: https://downloads.apache.org/httpd/CHANGES_2.4 https://www.cve.org/CVERecord?id=CVE-2024-39884 (* Security fix *) --- ChangeLog.rss | 21 +- ChangeLog.txt | 9 + FILELIST.TXT | 55 ++-- ...1ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch | 302 ------------------ source/n/httpd/httpd.SlackBuild | 5 +- source/n/httpd/httpd.url | 4 +- 6 files changed, 58 insertions(+), 338 deletions(-) delete mode 100644 source/n/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 6d721ec33..ad2c20433 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,26 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 3 Jul 2024 18:48:48 GMT - Wed, 3 Jul 2024 19:31:08 GMT + Wed, 3 Jul 2024 21:19:57 GMT + Wed, 3 Jul 2024 21:57:54 GMT maintain_current_git.sh v 1.17 + + Wed, 3 Jul 2024 21:19:57 GMT + Wed, 3 Jul 2024 21:19:57 GMT + https://git.slackware.nl/current/tag/?h=20240703211957 + 20240703211957 + + +n/httpd-2.4.61-x86_64-1.txz: Upgraded. + This update contains the fix for the 2.4.60 regression, which has also + been assigned a CVE. We fixed this already, but we'll make it official. + For more information, see: + https://downloads.apache.org/httpd/CHANGES_2.4 + https://www.cve.org/CVERecord?id=CVE-2024-39884 + (* Security fix *) + ]]> + + Wed, 3 Jul 2024 18:48:48 GMT Wed, 3 Jul 2024 18:48:48 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index c8fad1b84..24de87d58 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +Wed Jul 3 21:19:57 UTC 2024 +n/httpd-2.4.61-x86_64-1.txz: Upgraded. + This update contains the fix for the 2.4.60 regression, which has also + been assigned a CVE. We fixed this already, but we'll make it official. + For more information, see: + https://downloads.apache.org/httpd/CHANGES_2.4 + https://www.cve.org/CVERecord?id=CVE-2024-39884 + (* Security fix *) ++--------------------------+ Wed Jul 3 18:48:48 UTC 2024 ap/sysstat-12.7.6-x86_64-1.txz: Upgraded. d/cmake-3.30.0-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 1b276d61c..11d196c77 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Jul 3 18:53:53 UTC 2024 +Wed Jul 3 21:24:50 UTC 2024 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2024-07-03 18:48 . +drwxr-xr-x 12 root root 4096 2024-07-03 21:19 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1153350 2024-07-02 19:36 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-02 19:36 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1153283 2024-07-03 18:54 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-07-03 18:54 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 1114538 2024-07-03 18:48 ./ChangeLog.txt +-rw-r--r-- 1 root root 1114936 2024-07-03 21:19 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2024-06-27 21:36 ./EFI/BOOT -rw-r--r-- 1 root root 1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-06-27 21:36 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1509630 2024-07-02 19:36 ./FILELIST.TXT +-rw-r--r-- 1 root root 1509546 2024-07-03 18:53 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 912452 2024-07-03 18:53 ./PACKAGES.TXT +-rw-r--r-- 1 root root 912452 2024-07-03 21:24 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3623 2024-06-27 21:10 ./README.initrd -rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT @@ -662,11 +662,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2024-07-03 18:53 ./slackware64 --rw-r--r-- 1 root root 355854 2024-07-03 18:53 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-03 18:53 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 440695 2024-07-03 18:52 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4691748 2024-07-03 18:52 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2024-07-03 21:24 ./slackware64 +-rw-r--r-- 1 root root 355854 2024-07-03 21:24 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-07-03 21:24 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 440695 2024-07-03 21:23 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4692802 2024-07-03 21:23 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 32768 2024-07-01 20:16 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt @@ -4112,7 +4112,7 @@ drwxr-xr-x 2 root root 102400 2024-07-03 18:52 ./slackware64/l -rw-r--r-- 1 root root 403 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txt -rw-r--r-- 1 root root 773596 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2024-07-03 18:52 ./slackware64/n +drwxr-xr-x 2 root root 36864 2024-07-03 21:23 ./slackware64/n -rw-r--r-- 1 root root 357 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txt -rw-r--r-- 1 root root 1517848 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz.asc @@ -4218,9 +4218,9 @@ drwxr-xr-x 2 root root 36864 2024-07-03 18:52 ./slackware64/n -rw-r--r-- 1 root root 434 2023-03-08 02:12 ./slackware64/n/htdig-3.2.0b6-x86_64-9.txt -rw-r--r-- 1 root root 965928 2023-03-08 02:12 ./slackware64/n/htdig-3.2.0b6-x86_64-9.txz -rw-r--r-- 1 root root 163 2023-03-08 02:12 ./slackware64/n/htdig-3.2.0b6-x86_64-9.txz.asc --rw-r--r-- 1 root root 513 2024-07-02 18:41 ./slackware64/n/httpd-2.4.60-x86_64-2.txt --rw-r--r-- 1 root root 3947452 2024-07-02 18:41 ./slackware64/n/httpd-2.4.60-x86_64-2.txz --rw-r--r-- 1 root root 195 2024-07-02 18:41 ./slackware64/n/httpd-2.4.60-x86_64-2.txz.asc +-rw-r--r-- 1 root root 513 2024-07-03 21:04 ./slackware64/n/httpd-2.4.61-x86_64-1.txt +-rw-r--r-- 1 root root 3945992 2024-07-03 21:04 ./slackware64/n/httpd-2.4.61-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-07-03 21:04 ./slackware64/n/httpd-2.4.61-x86_64-1.txz.asc -rw-r--r-- 1 root root 365 2021-02-13 12:07 ./slackware64/n/icmpinfo-1.11-x86_64-5.txt -rw-r--r-- 1 root root 9520 2021-02-13 12:07 ./slackware64/n/icmpinfo-1.11-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 12:07 ./slackware64/n/icmpinfo-1.11-x86_64-5.txz.asc @@ -5786,11 +5786,11 @@ drwxr-xr-x 2 root root 4096 2024-05-05 18:37 ./slackware64/y -rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2024-07-03 18:53 ./source --rw-r--r-- 1 root root 621612 2024-07-03 18:53 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-07-03 18:53 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 866707 2024-07-03 18:53 ./source/FILE_LIST --rw-r--r-- 1 root root 29716426 2024-07-03 18:53 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-07-03 21:24 ./source +-rw-r--r-- 1 root root 621521 2024-07-03 21:24 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-07-03 21:24 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 866601 2024-07-03 21:24 ./source/FILE_LIST +-rw-r--r-- 1 root root 29708209 2024-07-03 21:24 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 124 root root 4096 2024-06-23 18:42 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -12802,14 +12802,13 @@ drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/n/htdig -rwxr-xr-x 1 root root 4869 2024-05-11 17:38 ./source/n/htdig/htdig.SlackBuild -rw-r--r-- 1 root root 288 2007-05-02 18:02 ./source/n/htdig/htdig.conf.diff.gz -rw-r--r-- 1 root root 887 2018-02-27 06:13 ./source/n/htdig/slack-desc -drwxr-xr-x 2 root root 4096 2024-07-02 18:34 ./source/n/httpd +drwxr-xr-x 2 root root 4096 2024-07-03 21:03 ./source/n/httpd -rw-r--r-- 1 root root 931 2018-09-24 18:58 ./source/n/httpd/doinst.sh.gz --rw-r--r-- 1 root root 12834 2024-07-02 18:34 ./source/n/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch --rw-r--r-- 1 root root 7508704 2024-07-01 11:27 ./source/n/httpd/httpd-2.4.60.tar.bz2 --rw-r--r-- 1 root root 833 2024-07-01 11:27 ./source/n/httpd/httpd-2.4.60.tar.bz2.asc --rwxr-xr-x 1 root root 9225 2024-07-02 18:34 ./source/n/httpd/httpd.SlackBuild +-rw-r--r-- 1 root root 7512908 2024-07-03 13:45 ./source/n/httpd/httpd-2.4.61.tar.bz2 +-rw-r--r-- 1 root root 833 2024-07-03 13:45 ./source/n/httpd/httpd-2.4.61.tar.bz2.asc +-rwxr-xr-x 1 root root 9111 2024-07-03 21:03 ./source/n/httpd/httpd.SlackBuild -rw-r--r-- 1 root root 260 2012-04-13 02:17 ./source/n/httpd/httpd.runasapache.diff.gz --rw-r--r-- 1 root root 112 2024-07-01 18:48 ./source/n/httpd/httpd.url +-rw-r--r-- 1 root root 112 2024-07-03 21:02 ./source/n/httpd/httpd.url -rw-r--r-- 1 root root 171 2021-05-23 19:15 ./source/n/httpd/logrotate.httpd -rw-r--r-- 1 root root 1001 2023-08-16 16:41 ./source/n/httpd/rc.httpd -rw-r--r-- 1 root root 966 2018-02-27 06:13 ./source/n/httpd/slack-desc @@ -15275,7 +15274,7 @@ drwxr-xr-x 2 root root 4096 2024-04-17 18:00 ./source/x/x11/src/lib -rw-r--r-- 1 root root 265384 2022-09-27 00:55 ./source/x/x11/src/lib/libXxf86vm-1.1.5.tar.xz -rw-r--r-- 1 root root 266952 2023-06-03 19:07 ./source/x/x11/src/lib/libdmx-1.1.5.tar.xz -rw-r--r-- 1 root root 274176 2024-03-02 18:32 ./source/x/x11/src/lib/libfontenc-1.1.8.tar.xz --rw-r--r-- 1 root root 64452 2024-03-23 23:00 ./source/x/x11/src/lib/libpciaccess-0.18.1.tar.xz +-rw-r--r-- 1 root root 64452 2024-03-23 23:00 ./source/x/x11/src/lib/libpciaccess-0.18.1.tar.xz -rw-r--r-- 1 root root 455208 2024-04-15 15:11 ./source/x/x11/src/lib/libxcb-1.17.0.tar.xz -rw-r--r-- 1 root root 9648 2022-07-19 08:56 ./source/x/x11/src/lib/libxcvt-0.1.2.tar.xz -rw-r--r-- 1 root root 314520 2024-02-04 22:15 ./source/x/x11/src/lib/libxkbfile-1.1.3.tar.xz diff --git a/source/n/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch b/source/n/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch deleted file mode 100644 index f3d6d6483..000000000 --- a/source/n/httpd/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch +++ /dev/null @@ -1,302 +0,0 @@ -From fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d Mon Sep 17 00:00:00 2001 -From: Eric Covener -Date: Tue, 2 Jul 2024 13:07:17 +0000 -Subject: [PATCH] Merge r1918795, r1918814 from trunk: - -maintain trusted flag - - -* Always trust content types that we set literally - -Submitted by: covener, rpluem -Reviewed by: covener, jorton, rpluem - -Github: closes #459 - - -git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1918839 13f79535-47bb-0310-9956-ffa450edef68 ---- - modules/cluster/mod_heartmonitor.c | 2 +- - modules/dav/main/mod_dav.c | 10 +++++----- - modules/examples/mod_example_hooks.c | 2 +- - modules/filters/mod_data.c | 2 +- - modules/filters/mod_include.c | 2 +- - modules/filters/mod_proxy_html.c | 4 ++-- - modules/generators/mod_cgi.c | 2 +- - modules/generators/mod_cgid.c | 2 +- - modules/generators/mod_info.c | 2 +- - modules/generators/mod_status.c | 4 ++-- - modules/http/http_filters.c | 2 +- - modules/http/http_protocol.c | 4 ++-- - modules/http/http_request.c | 2 +- - modules/ldap/util_ldap.c | 2 +- - modules/mappers/mod_imagemap.c | 2 +- - modules/proxy/mod_proxy_balancer.c | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c -index 53b650469d7..68db585181b 100644 ---- a/modules/cluster/mod_heartmonitor.c -+++ b/modules/cluster/mod_heartmonitor.c -@@ -782,7 +782,7 @@ static int hm_handler(request_rec *r) - hmserver.seen = apr_time_now(); - hm_update_stat(ctx, &hmserver, r->pool); - -- ap_set_content_type(r, "text/plain"); -+ ap_set_content_type_ex(r, "text/plain", 1); - ap_set_content_length(r, 2); - ap_rputs("OK", r); - ap_rflush(r); -diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c -index dea3f18b118..7a3eed7644a 100644 ---- a/modules/dav/main/mod_dav.c -+++ b/modules/dav/main/mod_dav.c -@@ -355,7 +355,7 @@ static int dav_error_response(request_rec *r, int status, const char *body) - r->status = status; - r->status_line = ap_get_status_line(status); - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - /* begin the response now... */ - ap_rvputs(r, -@@ -386,7 +386,7 @@ static int dav_error_response_tag(request_rec *r, - { - r->status = err->status; - -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - ap_rputs(DAV_XML_HEADER DEBUG_CR - "status = status; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - /* Send the headers and actual multistatus response now... */ - ap_fputs(r->output_filters, bb, DAV_XML_HEADER DEBUG_CR -@@ -2016,7 +2016,7 @@ static int dav_method_options(request_rec *r) - - /* send the options response */ - r->status = HTTP_OK; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - /* send the headers and response body */ - ap_rputs(DAV_XML_HEADER DEBUG_CR -@@ -3328,7 +3328,7 @@ static int dav_method_lock(request_rec *r) - (*locks_hooks->close_lockdb)(lockdb); - - r->status = HTTP_OK; -- ap_set_content_type(r, DAV_XML_CONTENT_TYPE); -+ ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); - - ap_rputs(DAV_XML_HEADER DEBUG_CR "" DEBUG_CR, r); - if (lock == NULL) -diff --git a/modules/examples/mod_example_hooks.c b/modules/examples/mod_example_hooks.c -index f7ef5a5ccf7..d9379060681 100644 ---- a/modules/examples/mod_example_hooks.c -+++ b/modules/examples/mod_example_hooks.c -@@ -993,7 +993,7 @@ static int x_handler(request_rec *r) - * Set the Content-type header. Note that we do not actually have to send - * the headers: this is done by the http core. - */ -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - /* - * If we're only supposed to send header information (HEAD request), we're - * already there. -diff --git a/modules/filters/mod_data.c b/modules/filters/mod_data.c -index ddadd1b3605..4e6e63606ca 100644 ---- a/modules/filters/mod_data.c -+++ b/modules/filters/mod_data.c -@@ -117,7 +117,7 @@ static apr_status_t data_out_filter(ap_filter_t *f, apr_bucket_brigade *bb) - } - } - -- ap_set_content_type(r, "text/plain"); -+ ap_set_content_type_ex(r, "text/plain", 1); - - } - -diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c -index 584d8fb311f..2c0cc67545c 100644 ---- a/modules/filters/mod_include.c -+++ b/modules/filters/mod_include.c -@@ -3972,7 +3972,7 @@ static int include_fixup(request_rec *r) - if (r->handler && (strcmp(r->handler, "server-parsed") == 0)) - { - if (!r->content_type || !*r->content_type) { -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - } - r->handler = "default-handler"; - } -diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c -index 7783da108d7..4205a617157 100644 ---- a/modules/filters/mod_proxy_html.c -+++ b/modules/filters/mod_proxy_html.c -@@ -952,7 +952,7 @@ static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb) - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, f->r, APLOGNO(01422) - "No i18n support found. Install mod_xml2enc if required"); - enc = XML_CHAR_ENCODING_NONE; -- ap_set_content_type(f->r, "text/html;charset=utf-8"); -+ ap_set_content_type_ex(f->r, "text/html;charset=utf-8", 1); - } - else { - /* if we wanted a non-default charset_out, insert the -@@ -968,7 +968,7 @@ static apr_status_t proxy_html_filter(ap_filter_t *f, apr_bucket_brigade *bb) - cenc, NULL)); - } - else /* Normal case, everything worked, utf-8 output */ -- ap_set_content_type(f->r, "text/html;charset=utf-8"); -+ ap_set_content_type_ex(f->r, "text/html;charset=utf-8", 1); - } - - ap_fputs(f->next, ctxt->bb, ctxt->cfg->doctype); -diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c -index 3799b06ce33..61d888dd946 100644 ---- a/modules/generators/mod_cgi.c -+++ b/modules/generators/mod_cgi.c -@@ -671,7 +671,7 @@ static apr_status_t include_cgi(include_ctx_t *ctx, ap_filter_t *f, - /* Force sub_req to be treated as a CGI request, even if ordinary - * typing rules would have called it something else. - */ -- ap_set_content_type(rr, CGI_MAGIC_TYPE); -+ ap_set_content_type_ex(rr, CGI_MAGIC_TYPE, 1); - - /* Run it. */ - rr_status = ap_run_sub_req(rr); -diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c -index 1d55b8dc481..f21eb12f741 100644 ---- a/modules/generators/mod_cgid.c -+++ b/modules/generators/mod_cgid.c -@@ -1666,7 +1666,7 @@ static apr_status_t include_cgi(include_ctx_t *ctx, ap_filter_t *f, - /* Force sub_req to be treated as a CGI request, even if ordinary - * typing rules would have called it something else. - */ -- ap_set_content_type(rr, CGI_MAGIC_TYPE); -+ ap_set_content_type_ex(rr, CGI_MAGIC_TYPE, 1); - - /* Run it. */ - rr_status = ap_run_sub_req(rr); -diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c -index 1662242afe9..a94e4e484c4 100644 ---- a/modules/generators/mod_info.c -+++ b/modules/generators/mod_info.c -@@ -784,7 +784,7 @@ static int display_info(request_rec * r) - return DECLINED; - } - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - ap_rputs(DOCTYPE_XHTML_1_0T - "\n" -diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c -index 5bada071185..2cb38c747fb 100644 ---- a/modules/generators/mod_status.c -+++ b/modules/generators/mod_status.c -@@ -273,7 +273,7 @@ static int status_handler(request_rec *r) - if (r->method_number != M_GET) - return DECLINED; - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - /* - * Simple table-driven form data set parser that lets you alter the header -@@ -301,7 +301,7 @@ static int status_handler(request_rec *r) - no_table_report = 1; - break; - case STAT_OPT_AUTO: -- ap_set_content_type(r, "text/plain; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/plain; charset=ISO-8859-1", 1); - short_report = 1; - break; - } -diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c -index f20aee73fa8..60b44d78580 100644 ---- a/modules/http/http_filters.c -+++ b/modules/http/http_filters.c -@@ -1261,7 +1261,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r) - } - } - -- ap_set_content_type(r, "message/http"); -+ ap_set_content_type_ex(r, "message/http", 1); - - /* Now we recreate the request, and echo it back */ - -diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c -index c31e8737337..3bc666e6d90 100644 ---- a/modules/http/http_protocol.c -+++ b/modules/http/http_protocol.c -@@ -1443,10 +1443,10 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) - request_conf->suppress_charset = 1; /* avoid adding default - * charset later - */ -- ap_set_content_type(r, "text/html"); -+ ap_set_content_type_ex(r, "text/html", 1); - } - else { -- ap_set_content_type(r, "text/html; charset=iso-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=iso-8859-1", 1); - } - - if ((status == HTTP_METHOD_NOT_ALLOWED) -diff --git a/modules/http/http_request.c b/modules/http/http_request.c -index d59cfe25999..71ecc2bbab1 100644 ---- a/modules/http/http_request.c -+++ b/modules/http/http_request.c -@@ -708,7 +708,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) - r->args = rr->args; - r->finfo = rr->finfo; - r->handler = rr->handler; -- ap_set_content_type(r, rr->content_type); -+ ap_set_content_type_ex(r, rr->content_type, AP_REQUEST_IS_TRUSTED_CT(r)); - r->content_encoding = rr->content_encoding; - r->content_languages = rr->content_languages; - r->per_dir_config = rr->per_dir_config; -diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c -index aa0bad1397c..8c9e58717d2 100644 ---- a/modules/ldap/util_ldap.c -+++ b/modules/ldap/util_ldap.c -@@ -171,7 +171,7 @@ static int util_ldap_handler(request_rec *r) - st = (util_ldap_state_t *) ap_get_module_config(r->server->module_config, - &ldap_module); - -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - if (r->header_only) - return OK; -diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c -index 206c0b6d44f..b2dca7e1ee7 100644 ---- a/modules/mappers/mod_imagemap.c -+++ b/modules/mappers/mod_imagemap.c -@@ -475,7 +475,7 @@ static int imap_reply(request_rec *r, const char *redirect) - - static void menu_header(request_rec *r, char *menu) - { -- ap_set_content_type(r, "text/html; charset=ISO-8859-1"); -+ ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); - - ap_rvputs(r, DOCTYPE_HTML_3_2, "\nMenu for ", - ap_escape_html(r->pool, r->uri), -diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c -index b8b452d0bfe..3c0f5a8d6ab 100644 ---- a/modules/proxy/mod_proxy_balancer.c -+++ b/modules/proxy/mod_proxy_balancer.c -@@ -1471,7 +1471,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf, - - if (usexml) { - char date[APR_RFC822_DATE_LEN]; -- ap_set_content_type(r, "text/xml"); -+ ap_set_content_type_ex(r, "text/xml", 1); - ap_rputs("<?xml version='1.0' encoding='UTF-8' ?>\n", r); - ap_rputs("<httpd:manager xmlns:httpd='http://httpd.apache.org'>\n", r); - ap_rputs(" <httpd:balancers>\n", r); diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 90838f9a0..ccd121e91 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=httpd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -81,9 +81,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix 2.4.60 regression: -cat $CWD/fe171ffdf85cdfc3f6f44e8dd0ee3d5e3e6a0d1d.patch | patch -p1 --verbose || exit 1 - # A brief note about mpms: # # "prefork" is the legacy forked mpm, used with mod_php. Starting with httpd diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url index 20f7f32ce..604aa6aa4 100644 --- a/source/n/httpd/httpd.url +++ b/source/n/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.60.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.60.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.61.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.61.tar.bz2.asc