$N in the substitution string!
+ B (escape backreferences)
+The [B] flag instructs RewriteRule to escape non-alphanumeric
+ characters before applying the transformation.
In 2.4.26 and later, you can limit the escaping to specific characters
+-in backreferences by listing them: [B=#?;]. Note: The space
+-character can be used in the list of characters to escape, but it cannot be
+-the last character in the list.
mod_rewrite has to unescape URLs before mapping them,
+ so backreferences are unescaped at the time they are applied.
+@@ -120,6 +116,20 @@ when the backend may break if presented with an unescaped URL.
An alternative to this flag is using a RewriteCond to capture against %{THE_REQUEST} which will capture
+ strings in the encoded form.
In 2.4.26 and later, you can limit the escaping to specific characters
++in backreferences by listing them: [B=#?;]. Note: The space
++character can be used in the list of characters to escape, but you must quote
++the entire third argument of RewriteRule
++and the space must not be the last character in the list.
# Escape spaces and question marks. The quotes around the final argument ++# are required when a space is included. ++RewriteRule "^search/(.*)$" "/search.php?term=$1" "[B= ?]"++ ++
To limit the characters escaped this way, see #flag_bne ++and #flag_bctls
++ +
BNP|backrefnoplus (don't escape space to +)
+diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c +index 38dbb24..b71c67c 100644 +--- a/modules/mappers/mod_rewrite.c ++++ b/modules/mappers/mod_rewrite.c +@@ -101,6 +101,8 @@ + #include "mod_rewrite.h" + #include "ap_expr.h" + ++#include "test_char.h" ++ + static ap_dbd_t *(*dbd_acquire)(request_rec*) = NULL; + static void (*dbd_prepare)(server_rec*, const char*, const char*) = NULL; + static const char* really_last_key = "rewrite_really_last"; +@@ -168,6 +170,8 @@ static const char* really_last_key = "rewrite_really_last"; + #define RULEFLAG_END (1<<17) + #define RULEFLAG_ESCAPENOPLUS (1<<18) + #define RULEFLAG_QSLAST (1<<19) ++#define RULEFLAG_QSNONE (1<<20) /* programattic only */ ++#define RULEFLAG_ESCAPECTLS (1<<21) + + /* return code of the rewrite rule + * the result may be escaped - or not +@@ -321,7 +325,8 @@ typedef struct { + data_item *cookie; /* added cookies */ + int skip; /* number of next rules to skip */ + int maxrounds; /* limit on number of loops with N flag */ +- char *escapes; /* specific backref escapes */ ++ const char *escapes; /* specific backref escapes */ ++ const char *noescapes; /* specific backref chars not to escape */ + } rewriterule_entry; + + typedef struct { +@@ -422,7 +427,9 @@ static const char *rewritemap_mutex_type = "rewrite-map"; + /* Optional functions imported from mod_ssl when loaded: */ + static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *rewrite_ssl_lookup = NULL; + static APR_OPTIONAL_FN_TYPE(ssl_is_https) *rewrite_is_https = NULL; +-static char *escape_backref(apr_pool_t *p, const char *path, const char *escapeme, int noplus); ++static char *escape_backref(apr_pool_t *p, const char *path, ++ const char *escapeme, const char *noescapeme, ++ int flags); + + /* + * +-------------------------------------------------------+ +@@ -645,18 +652,26 @@ static APR_INLINE unsigned char *c2x(unsigned what, unsigned char prefix, + return where; + } + ++ + /* + * Escapes a backreference in a similar way as php's urlencode does. + * Based on ap_os_escape_path in server/util.c + */ +-static char *escape_backref(apr_pool_t *p, const char *path, const char *escapeme, int noplus) { +- char *copy = apr_palloc(p, 3 * strlen(path) + 3); ++static char *escape_backref(apr_pool_t *p, const char *path, ++ const char *escapeme, const char *noescapeme, ++ int flags) ++{ ++ char *copy = apr_palloc(p, 3 * strlen(path) + 1); + const unsigned char *s = (const unsigned char *)path; + unsigned char *d = (unsigned char *)copy; +- unsigned c; ++ int noplus = (flags & RULEFLAG_ESCAPENOPLUS) != 0; ++ int ctls = (flags & RULEFLAG_ESCAPECTLS) != 0; ++ unsigned char c; + + while ((c = *s)) { +- if (!escapeme) { ++ if (((ctls ? !TEST_CHAR(c, T_VCHAR_OBSTEXT) : !escapeme) ++ || (escapeme && ap_strchr_c(escapeme, c))) ++ && (!noescapeme || !ap_strchr_c(noescapeme, c))) { + if (apr_isalnum(c) || c == '_') { + *d++ = c; + } +@@ -667,23 +682,8 @@ static char *escape_backref(apr_pool_t *p, const char *path, const char *escapem + d = c2x(c, '%', d); + } + } +- else { +- const char *esc = escapeme; +- while (*esc) { +- if (c == *esc) { +- if (c == ' ' && !noplus) { +- *d++ = '+'; +- } +- else { +- d = c2x(c, '%', d); +- } +- break; +- } +- ++esc; +- } +- if (!*esc) { +- *d++ = c; +- } ++ else { ++ *d++ = c; + } + ++s; + } +@@ -761,15 +761,24 @@ static char *escape_absolute_uri(apr_pool_t *p, char *uri, unsigned scheme) + ap_escape_uri(p, cp), NULL); + } + ++ + /* + * split out a QUERY_STRING part from + * the current URI string + */ +-static void splitout_queryargs(request_rec *r, int qsappend, int qsdiscard, +- int qslast) ++static void splitout_queryargs(request_rec *r, int flags) + { + char *q; + int split; ++ int qsappend = flags & RULEFLAG_QSAPPEND; ++ int qsdiscard = flags & RULEFLAG_QSDISCARD; ++ int qslast = flags & RULEFLAG_QSLAST; ++ ++ if (flags & RULEFLAG_QSNONE) { ++ rewritelog((r, 2, NULL, "discarding query string, no parse from substitution")); ++ r->args = NULL; ++ return; ++ } + + /* don't touch, unless it's a scheme for which a query string makes sense. + * See RFC 1738 and RFC 2368. +@@ -794,7 +803,7 @@ static void splitout_queryargs(request_rec *r, int qsappend, int qsdiscard, + olduri = apr_pstrdup(r->pool, r->filename); + *q++ = '\0'; + if (qsappend) { +- if (*q) { ++ if (*q) { + r->args = apr_pstrcat(r->pool, q, "&" , r->args, NULL); + } + } +@@ -802,9 +811,9 @@ static void splitout_queryargs(request_rec *r, int qsappend, int qsdiscard, + r->args = apr_pstrdup(r->pool, q); + } + +- if (r->args) { ++ if (r->args) { + len = strlen(r->args); +- ++ + if (!len) { + r->args = NULL; + } +@@ -2436,7 +2445,8 @@ static char *do_expand(char *input, rewrite_ctx *ctx, rewriterule_entry *entry) + /* escape the backreference */ + char *tmp2, *tmp; + tmp = apr_pstrmemdup(pool, bri->source + bri->regmatch[n].rm_so, span); +- tmp2 = escape_backref(pool, tmp, entry->escapes, entry->flags & RULEFLAG_ESCAPENOPLUS); ++ tmp2 = escape_backref(pool, tmp, entry->escapes, entry->noescapes, ++ entry->flags); + rewritelog((ctx->r, 5, ctx->perdir, "escaping backreference '%s' to '%s'", + tmp, tmp2)); + +@@ -2733,7 +2743,7 @@ static apr_status_t rewritelock_remove(void *data) + * XXX: what an inclined parser. Seems we have to leave it so + * for backwards compat. *sigh* + */ +-static int parseargline(char *str, char **a1, char **a2, char **a3) ++static int parseargline(char *str, char **a1, char **a2, char **a2_end, char **a3) + { + char quote; + +@@ -2784,8 +2794,10 @@ static int parseargline(char *str, char **a1, char **a2, char **a3) + + if (!*str) { + *a3 = NULL; /* 3rd argument is optional */ ++ *a2_end = str; + return 0; + } ++ *a2_end = str; + *str++ = '\0'; + + while (apr_isspace(*str)) { +@@ -3323,7 +3335,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, void *in_dconf, + rewrite_server_conf *sconf; + rewritecond_entry *newcond; + ap_regex_t *regexp; +- char *a1 = NULL, *a2 = NULL, *a3 = NULL; ++ char *a1 = NULL, *a2 = NULL, *a2_end, *a3 = NULL; + const char *err; + + sconf = ap_get_module_config(cmd->server->module_config, &rewrite_module); +@@ -3341,7 +3353,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, void *in_dconf, + * of the argument line. So we can use a1 .. a3 without + * copying them again. + */ +- if (parseargline(str, &a1, &a2, &a3)) { ++ if (parseargline(str, &a1, &a2, &a2_end, &a3)) { + return apr_pstrcat(cmd->pool, "RewriteCond: bad argument line '", str, + "'", NULL); + } +@@ -3500,13 +3512,24 @@ static const char *cmd_rewriterule_setflag(apr_pool_t *p, void *_cfg, + case 'B': + if (!*key || !strcasecmp(key, "ackrefescaping")) { + cfg->flags |= RULEFLAG_ESCAPEBACKREF; +- if (val && *val) { ++ if (val && *val) { + cfg->escapes = val; + } + } ++ else if (!strcasecmp(key, "NE")) { ++ if (val && *val) { ++ cfg->noescapes = val; ++ } ++ else { ++ return "flag 'BNE' wants a list of characters (i.e. [BNE=...])"; ++ } ++ } + else if (!strcasecmp(key, "NP") || !strcasecmp(key, "ackrefernoplus")) { + cfg->flags |= RULEFLAG_ESCAPENOPLUS; + } ++ else if (!strcasecmp(key, "CTLS")) { ++ cfg->flags |= RULEFLAG_ESCAPECTLS|RULEFLAG_ESCAPEBACKREF; ++ } + else { + ++error; + } +@@ -3749,7 +3772,7 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf, + rewrite_server_conf *sconf; + rewriterule_entry *newrule; + ap_regex_t *regexp; +- char *a1 = NULL, *a2 = NULL, *a3 = NULL; ++ char *a1 = NULL, *a2 = NULL, *a2_end, *a3 = NULL; + const char *err; + + sconf = ap_get_module_config(cmd->server->module_config, &rewrite_module); +@@ -3763,12 +3786,11 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf, + } + + /* parse the argument line ourself */ +- if (parseargline(str, &a1, &a2, &a3)) { ++ if (parseargline(str, &a1, &a2, &a2_end, &a3)) { + return apr_pstrcat(cmd->pool, "RewriteRule: bad argument line '", str, + "'", NULL); + } + +- /* arg3: optional flags field */ + newrule->forced_mimetype = NULL; + newrule->forced_handler = NULL; + newrule->forced_responsecode = HTTP_MOVED_TEMPORARILY; +@@ -3777,6 +3799,9 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf, + newrule->cookie = NULL; + newrule->skip = 0; + newrule->maxrounds = REWRITE_MAX_ROUNDS; ++ newrule->escapes = newrule->noescapes = NULL; ++ ++ /* arg3: optional flags field */ + if (a3 != NULL) { + if ((err = cmd_parseflagfield(cmd->pool, newrule, a3, + cmd_rewriterule_setflag)) != NULL) { +@@ -3810,6 +3835,17 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf, + newrule->flags |= RULEFLAG_NOSUB; + } + ++ if (*(a2_end-1) == '?') { ++ /* a literal ? at the end of the unsubstituted rewrite rule */ ++ newrule->flags |= RULEFLAG_QSNONE; ++ *(a2_end-1) = '\0'; /* trailing ? has done its job */ ++ } ++ else if (newrule->flags & RULEFLAG_QSDISCARD) { ++ if (NULL == ap_strchr(newrule->output, '?')) { ++ newrule->flags |= RULEFLAG_QSNONE; ++ } ++ } ++ + /* now, if the server or per-dir config holds an + * array of RewriteCond entries, we take it for us + * and clear the array +@@ -4215,9 +4251,7 @@ static int apply_rewrite_rule(rewriterule_entry *p, rewrite_ctx *ctx) + r->path_info = NULL; + } + +- splitout_queryargs(r, p->flags & RULEFLAG_QSAPPEND, +- p->flags & RULEFLAG_QSDISCARD, +- p->flags & RULEFLAG_QSLAST); ++ splitout_queryargs(r, p->flags); + + /* Add the previously stripped per-directory location prefix, unless + * (1) it's an absolute URL path and +@@ -4696,8 +4730,25 @@ static int hook_uri2file(request_rec *r) + } + + if (rulestatus) { +- unsigned skip; +- apr_size_t flen; ++ unsigned skip_absolute = is_absolute_uri(r->filename, NULL); ++ apr_size_t flen = r->filename ? strlen(r->filename) : 0; ++ int to_proxyreq = (flen > 6 && strncmp(r->filename, "proxy:", 6) == 0); ++ int will_escape = skip_absolute && (rulestatus != ACTION_NOESCAPE); ++ ++ if (r->args ++ && !will_escape ++ && *(ap_scan_vchar_obstext(r->args))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ * Correct encoding was missed and we're not going to escape ++ * it before returning. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10410) ++ "Rewritten query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + + if (ACTION_STATUS == rulestatus) { + int n = r->status; +@@ -4706,8 +4757,7 @@ static int hook_uri2file(request_rec *r) + return n; + } + +- flen = r->filename ? strlen(r->filename) : 0; +- if (flen > 6 && strncmp(r->filename, "proxy:", 6) == 0) { ++ if (to_proxyreq) { + /* it should be go on as an internal proxy request */ + + /* check if the proxy module is enabled, so +@@ -4749,7 +4799,7 @@ static int hook_uri2file(request_rec *r) + r->filename)); + return OK; + } +- else if ((skip = is_absolute_uri(r->filename, NULL)) > 0) { ++ else if (skip_absolute > 0) { + int n; + + /* it was finally rewritten to a remote URL */ +@@ -4757,7 +4807,7 @@ static int hook_uri2file(request_rec *r) + if (rulestatus != ACTION_NOESCAPE) { + rewritelog((r, 1, NULL, "escaping %s for redirect", + r->filename)); +- r->filename = escape_absolute_uri(r->pool, r->filename, skip); ++ r->filename = escape_absolute_uri(r->pool, r->filename, skip_absolute); + } + + /* append the QUERY_STRING part */ +@@ -4981,7 +5031,26 @@ static int hook_fixup(request_rec *r) + */ + rulestatus = apply_rewrite_list(r, dconf->rewriterules, dconf->directory); + if (rulestatus) { +- unsigned skip; ++ unsigned skip_absolute = is_absolute_uri(r->filename, NULL); ++ int to_proxyreq = 0; ++ int will_escape = 0; ++ ++ l = strlen(r->filename); ++ to_proxyreq = l > 6 && strncmp(r->filename, "proxy:", 6) == 0; ++ will_escape = skip_absolute && (rulestatus != ACTION_NOESCAPE); ++ ++ if (r->args ++ && !will_escape ++ && *(ap_scan_vchar_obstext(r->args))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10411) ++ "Rewritten query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + + if (ACTION_STATUS == rulestatus) { + int n = r->status; +@@ -4990,8 +5059,7 @@ static int hook_fixup(request_rec *r) + return n; + } + +- l = strlen(r->filename); +- if (l > 6 && strncmp(r->filename, "proxy:", 6) == 0) { ++ if (to_proxyreq) { + /* it should go on as an internal proxy request */ + + /* make sure the QUERY_STRING and +@@ -5015,7 +5083,7 @@ static int hook_fixup(request_rec *r) + "%s [OK]", r->filename)); + return OK; + } +- else if ((skip = is_absolute_uri(r->filename, NULL)) > 0) { ++ else if (skip_absolute > 0) { + /* it was finally rewritten to a remote URL */ + + /* because we are in a per-dir context +@@ -5024,7 +5092,7 @@ static int hook_fixup(request_rec *r) + */ + if (dconf->baseurl != NULL) { + /* skip 'scheme://' */ +- cp = r->filename + skip; ++ cp = r->filename + skip_absolute; + + if ((cp = ap_strchr(cp, '/')) != NULL && *(++cp)) { + rewritelog((r, 2, dconf->directory, +@@ -5069,7 +5137,7 @@ static int hook_fixup(request_rec *r) + if (rulestatus != ACTION_NOESCAPE) { + rewritelog((r, 1, dconf->directory, "escaping %s for redirect", + r->filename)); +- r->filename = escape_absolute_uri(r->pool, r->filename, skip); ++ r->filename = escape_absolute_uri(r->pool, r->filename, skip_absolute); + } + + /* append the QUERY_STRING part */ +diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c +index cbb0872..873ccf1 100644 +--- a/modules/proxy/mod_proxy_ajp.c ++++ b/modules/proxy/mod_proxy_ajp.c +@@ -69,6 +69,16 @@ static int proxy_ajp_canon(request_rec *r, char *url) + path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0, + r->proxyreq); + search = r->args; ++ if (search && *(ap_scan_vchar_obstext(search))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10406) ++ "To be forwarded query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + } + if (path == NULL) + return HTTP_BAD_REQUEST; +diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c +index 3a28038..c599e1a 100644 +--- a/modules/proxy/mod_proxy_balancer.c ++++ b/modules/proxy/mod_proxy_balancer.c +@@ -106,6 +106,16 @@ static int proxy_balancer_canon(request_rec *r, char *url) + path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0, + r->proxyreq); + search = r->args; ++ if (search && *(ap_scan_vchar_obstext(search))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10407) ++ "To be forwarded query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + } + if (path == NULL) + return HTTP_BAD_REQUEST; +diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c +index 7573638..fe7b322 100644 +--- a/modules/proxy/mod_proxy_http.c ++++ b/modules/proxy/mod_proxy_http.c +@@ -90,6 +90,16 @@ static int proxy_http_canon(request_rec *r, char *url) + path = ap_proxy_canonenc(r->pool, url, strlen(url), + enc_path, 0, r->proxyreq); + search = r->args; ++ if (search && *(ap_scan_vchar_obstext(search))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10408) ++ "To be forwarded query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + } + break; + case PROXYREQ_PROXY: +diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c +index e005a94..f5e27d9 100644 +--- a/modules/proxy/mod_proxy_wstunnel.c ++++ b/modules/proxy/mod_proxy_wstunnel.c +@@ -77,6 +77,16 @@ static int proxy_wstunnel_canon(request_rec *r, char *url) + path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0, + r->proxyreq); + search = r->args; ++ if (search && *(ap_scan_vchar_obstext(search))) { ++ /* ++ * We have a raw control character or a ' ' in r->args. ++ * Correct encoding was missed. ++ */ ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(10409) ++ "To be forwarded query string contains control " ++ "characters or spaces"); ++ return HTTP_FORBIDDEN; ++ } + } + if (path == NULL) + return HTTP_BAD_REQUEST; +diff --git a/server/gen_test_char.c b/server/gen_test_char.c +index 48ae6f4..6a153a3 100644 +--- a/server/gen_test_char.c ++++ b/server/gen_test_char.c +@@ -169,5 +169,15 @@ int main(int argc, char *argv[]) + + printf("\n};\n"); + ++ ++ printf( ++ "/* we assume the folks using this ensure 0 <= c < 256... which means\n" ++ " * you need a cast to (unsigned char) first, you can't just plug a\n" ++ " * char in here and get it to work, because if char is signed then it\n" ++ " * will first be sign extended.\n" ++ " */\n" ++ "#define TEST_CHAR(c, f) (test_char_table[(unsigned char)(c)] & (f))\n" ++ ); ++ + return 0; + } +diff --git a/server/util.c b/server/util.c +index 45051b7..9d897d4 100644 +--- a/server/util.c ++++ b/server/util.c +@@ -74,13 +74,6 @@ + */ + #include "test_char.h" + +-/* we assume the folks using this ensure 0 <= c < 256... which means +- * you need a cast to (unsigned char) first, you can't just plug a +- * char in here and get it to work, because if char is signed then it +- * will first be sign extended. +- */ +-#define TEST_CHAR(c, f) (test_char_table[(unsigned char)(c)] & (f)) +- + /* Win32/NetWare/OS2 need to check for both forward and back slashes + * in ap_getparents() and ap_escape_url. + */ diff --git a/httpd-2.4.43-apxs.patch b/httpd-2.4.43-apxs.patch deleted file mode 100644 index b1185b2..0000000 --- a/httpd-2.4.43-apxs.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/support/apxs.in b/support/apxs.in -index b2705fa..c331631 100644 ---- a/support/apxs.in -+++ b/support/apxs.in -@@ -35,7 +35,18 @@ if ($ddi >= 0) { - - my %config_vars = (); - --my $installbuilddir = "@exp_installbuilddir@"; -+# Awful hack to make apxs libdir-agnostic: -+my $pkg_config = "/usr/bin/pkg-config"; -+if (! -x "$pkg_config") { -+ error("$pkg_config not found!"); -+ exit(1); -+} -+ -+my $libdir = `pkg-config --variable=libdir apr-1`; -+chomp $libdir; -+ -+my $installbuilddir = $libdir . "/httpd/build"; -+ - get_config_vars($destdir . "$installbuilddir/config_vars.mk",\%config_vars); - - # read the configuration variables once -@@ -285,7 +296,7 @@ if ($opt_g) { - $data =~ s|%NAME%|$name|sg; - $data =~ s|%TARGET%|$CFG_TARGET|sg; - $data =~ s|%PREFIX%|$prefix|sg; -- $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg; -+ $data =~ s|%LIBDIR%|$libdir|sg; - - my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s); - -@@ -463,11 +474,11 @@ if ($opt_c) { - my $ldflags = "$CFG_LDFLAGS"; - if ($opt_p == 1) { - -- my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`; -+ my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`; - chomp($apr_libs); - my $apu_libs=""; - if ($apr_major_version < 2) { -- $apu_libs=`$apu_config --ldflags --link-libtool --libs`; -+ $apu_libs=`$apu_config --ldflags --link-libtool`; - chomp($apu_libs); - } - -@@ -682,8 +693,8 @@ __DATA__ - - builddir=. - top_srcdir=%PREFIX% --top_builddir=%PREFIX% --include %INSTALLBUILDDIR%/special.mk -+top_builddir=%LIBDIR%/httpd -+include %LIBDIR%/httpd/build/special.mk - - # the used tools - APACHECTL=apachectl diff --git a/httpd-2.4.43-cachehardmax.patch b/httpd-2.4.43-cachehardmax.patch deleted file mode 100644 index 755f822..0000000 --- a/httpd-2.4.43-cachehardmax.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h -index 6b92151..4c42a8e 100644 ---- a/modules/cache/cache_util.h -+++ b/modules/cache/cache_util.h -@@ -195,6 +195,9 @@ typedef struct { - unsigned int store_nostore_set:1; - unsigned int enable_set:1; - unsigned int disable_set:1; -+ /* treat maxex as hard limit */ -+ unsigned int hardmaxex:1; -+ unsigned int hardmaxex_set:1; - } cache_dir_conf; - - /* A linked-list of authn providers. */ -diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c -index 3b9aa4f..8268503 100644 ---- a/modules/cache/mod_cache.c -+++ b/modules/cache/mod_cache.c -@@ -1455,6 +1455,11 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) - exp = date + dconf->defex; - } - } -+ /* else, forcibly cap the expiry date if required */ -+ else if (dconf->hardmaxex && (date + dconf->maxex) < exp) { -+ exp = date + dconf->maxex; -+ } -+ - info->expire = exp; - - /* We found a stale entry which wasn't really stale. */ -@@ -1954,7 +1959,9 @@ static void *create_dir_config(apr_pool_t *p, char *dummy) - - /* array of providers for this URL space */ - dconf->cacheenable = apr_array_make(p, 10, sizeof(struct cache_enable)); -- -+ /* flag; treat maxex as hard limit */ -+ dconf->hardmaxex = 0; -+ dconf->hardmaxex_set = 0; - return dconf; - } - -@@ -2004,7 +2011,10 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) { - new->enable_set = add->enable_set || base->enable_set; - new->disable = (add->disable_set == 0) ? base->disable : add->disable; - new->disable_set = add->disable_set || base->disable_set; -- -+ new->hardmaxex = -+ (add->hardmaxex_set == 0) -+ ? base->hardmaxex -+ : add->hardmaxex; - return new; - } - -@@ -2332,12 +2342,18 @@ static const char *add_cache_disable(cmd_parms *parms, void *dummy, - } - - static const char *set_cache_maxex(cmd_parms *parms, void *dummy, -- const char *arg) -+ const char *arg, const char *hard) - { - cache_dir_conf *dconf = (cache_dir_conf *)dummy; - - dconf->maxex = (apr_time_t) (atol(arg) * MSEC_ONE_SEC); - dconf->maxex_set = 1; -+ -+ if (hard && strcasecmp(hard, "hard") == 0) { -+ dconf->hardmaxex = 1; -+ dconf->hardmaxex_set = 1; -+ } -+ - return NULL; - } - -@@ -2545,7 +2561,7 @@ static const command_rec cache_cmds[] = - "caching is enabled"), - AP_INIT_TAKE1("CacheDisable", add_cache_disable, NULL, RSRC_CONF|ACCESS_CONF, - "A partial URL prefix below which caching is disabled"), -- AP_INIT_TAKE1("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF, -+ AP_INIT_TAKE12("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF, - "The maximum time in seconds to cache a document"), - AP_INIT_TAKE1("CacheMinExpire", set_cache_minex, NULL, RSRC_CONF|ACCESS_CONF, - "The minimum time in seconds to cache a document"), diff --git a/httpd-2.4.43-corelimit.patch b/httpd-2.4.43-corelimit.patch deleted file mode 100644 index dd4b874..0000000 --- a/httpd-2.4.43-corelimit.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/server/core.c b/server/core.c -index 79b2a82..dc0f17a 100644 ---- a/server/core.c -+++ b/server/core.c -@@ -4996,6 +4996,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte - } - apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, - apr_pool_cleanup_null); -+ -+#ifdef RLIMIT_CORE -+ if (ap_coredumpdir_configured) { -+ struct rlimit lim; -+ -+ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) { -+ lim.rlim_cur = lim.rlim_max; -+ if (setrlimit(RLIMIT_CORE, &lim) == 0) { -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, -+ "core dump file size limit raised to %lu bytes", -+ lim.rlim_cur); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL, -+ "core dump file size is zero, setrlimit failed"); -+ } -+ } -+ } -+#endif -+ - return OK; - } - diff --git a/httpd-2.4.43-deplibs.patch b/httpd-2.4.43-deplibs.patch deleted file mode 100644 index c60f5a5..0000000 --- a/httpd-2.4.43-deplibs.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/configure.in b/configure.in -index f8f9442..f276550 100644 ---- a/configure.in -+++ b/configure.in -@@ -786,9 +786,9 @@ APACHE_SUBST(INSTALL_SUEXEC) - - dnl APR should go after the other libs, so the right symbols can be picked up - if test x${apu_found} != xobsolete; then -- AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`" -+ AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool`" - fi --AP_LIBS="$AP_LIBS `$apr_config --link-libtool --libs`" -+AP_LIBS="$AP_LIBS `$apr_config --link-libtool`" - APACHE_SUBST(AP_LIBS) - APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) - APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) diff --git a/httpd-2.4.43-enable-sslv3.patch b/httpd-2.4.43-enable-sslv3.patch deleted file mode 100644 index 2861605..0000000 --- a/httpd-2.4.43-enable-sslv3.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c -index 979489c..3d6443b 100644 ---- a/modules/ssl/ssl_engine_config.c -+++ b/modules/ssl/ssl_engine_config.c -@@ -1485,6 +1485,10 @@ static const char *ssl_cmd_protocol_parse(cmd_parms *parms, - #endif - else if (strcEQ(w, "all")) { - thisopt = SSL_PROTOCOL_ALL; -+#ifndef OPENSSL_NO_SSL3 -+ /* by default, ALL kw doesn't turn on SSLv3 */ -+ thisopt &= ~SSL_PROTOCOL_SSLV3; -+#endif - } - else { - return apr_pstrcat(parms->temp_pool, -diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c -index b0fcf81..ab6f263 100644 ---- a/modules/ssl/ssl_engine_init.c -+++ b/modules/ssl/ssl_engine_init.c -@@ -568,6 +568,28 @@ static apr_status_t ssl_init_ctx_tls_extensions(server_rec *s, - } - #endif - -+/* -+ * Enable/disable SSLProtocol. If the mod_ssl enables protocol -+ * which is disabled by default by OpenSSL, show a warning. -+ * "option" is for example SSL_OP_NO_SSLv3. -+ */ -+static void ssl_set_ctx_protocol_option(server_rec *s, -+ SSL_CTX *ctx, -+ long option, -+ int enabled, -+ const char *name) -+{ -+ if (!enabled) { -+ SSL_CTX_set_options(ctx, option); -+ } -+ else if (SSL_CTX_get_options(ctx) & option) { -+ SSL_CTX_clear_options(ctx, option); -+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02904) -+ "Allowing SSLProtocol %s even though it is disabled " -+ "by OpenSSL by default on this system", name); -+ } -+} -+ - static apr_status_t ssl_init_ctx_protocol(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, -@@ -735,9 +757,13 @@ static apr_status_t ssl_init_ctx_protocol(server_rec *s, - } - if (prot == TLS1_1_VERSION && protocol & SSL_PROTOCOL_TLSV1) { - prot = TLS1_VERSION; -+ ssl_set_ctx_protocol_option(s, ctx, SSL_OP_NO_TLSv1, -+ protocol & SSL_PROTOCOL_TLSV1, "TLSv1"); - } - #ifndef OPENSSL_NO_SSL3 - if (prot == TLS1_VERSION && protocol & SSL_PROTOCOL_SSLV3) { -+ ssl_set_ctx_protocol_option(s, ctx, SSL_OP_NO_SSLv3, -+ protocol & SSL_PROTOCOL_SSLV3, "SSLv3"); - prot = SSL3_VERSION; - } - #endif diff --git a/httpd-2.4.43-gettid.patch b/httpd-2.4.43-gettid.patch deleted file mode 100644 index f80b3a7..0000000 --- a/httpd-2.4.43-gettid.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d4e5b6e1e5585d341d1e51f1ddc637c099111076 Mon Sep 17 00:00:00 2001 -From: Joe Orton
EnableExceptionHook GracefulShutdownTimeout Listen ListenFree ListenBackLog ListenCoresBucketsRatio MaxConnectionsPerChildAddress already in use error message,
- including other causes.
-
-
-+
-+ListenFree Directive
-+| Description: | IP addresses and ports that the server -+listens to. Doesn't require IP address to be up |
|---|---|
| Syntax: | ListenFree [IP-address:]portnumber [protocol] |
| Context: | server config |
| Status: | MPM |
| Module: | event, worker, prefork, mpm_winnt, mpm_netware, mpmt_os2 |
| Compatibility: | This directive is currently available only in Red Hat Enterprise Linux |
The ListenFree directive is
-+ identical to the Listen directive.
-+ The only difference is in the usage of the IP_FREEBIND socket
-+ option, which is enabled by default with ListenFree.
-+ If IP_FREEBIND is enabled, it allows httpd to bind to an IP
-+ address that is nonlocal or does not (yet) exist. This allows httpd to
-+ listen on a socket without requiring the underlying network interface
-+ or the specified dynamic IP address to be up at the time when httpd
-+ is trying to bind to it.
-+
ListenBackLog Directive
-
| Description: | Sets the maximum amount of time to wait for data on the websockets tunnel |
|---|---|
| Syntax: | ProxyWebsocketIdleTimeout num[ms] |
| Default: | ProxyWebsocketIdleTimeout 0 |
| Context: | server config, virtual host |
| Status: | Extension |
| Module: | mod_proxy_wstunnel |
This directive imposes a maximum amount of time for the tunnel to be -+ left open while idle. The timeout is considered in seconds by default, but -+ it is possible to increase the time resolution to milliseconds -+ adding the ms suffix.
-+ -+Available Languages: en |
-diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
-index bcbba42..c29ded1 100644
---- a/modules/proxy/mod_proxy_wstunnel.c
-+++ b/modules/proxy/mod_proxy_wstunnel.c
-@@ -22,6 +22,7 @@ module AP_MODULE_DECLARE_DATA proxy_wstunnel_module;
- typedef struct {
- unsigned int fallback_to_proxy_http :1,
- fallback_to_proxy_http_set :1;
-+ apr_time_t idle_timeout;
- } proxyws_dir_conf;
-
- static int can_fallback_to_proxy_http;
-@@ -152,6 +153,8 @@ static int proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
- conn_rec *c = r->connection;
- apr_socket_t *sock = conn->sock;
- conn_rec *backconn = conn->connection;
-+ proxyws_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
-+ &proxy_wstunnel_module);
- char *buf;
- apr_bucket_brigade *header_brigade;
- apr_bucket *e;
-@@ -229,10 +232,13 @@ static int proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
- c->keepalive = AP_CONN_CLOSE;
-
- do { /* Loop until done (one side closes the connection, or an error) */
-- rv = apr_pollset_poll(pollset, -1, &pollcnt, &signalled);
-+ rv = apr_pollset_poll(pollset, dconf->idle_timeout, &pollcnt, &signalled);
- if (rv != APR_SUCCESS) {
- if (APR_STATUS_IS_EINTR(rv)) {
- continue;
-+ } else if(APR_STATUS_IS_TIMEUP(rv)){
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, "RH: the connection has timed out");
-+ return HTTP_REQUEST_TIME_OUT;
- }
- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(02444) "error apr_poll()");
- return HTTP_INTERNAL_SERVER_ERROR;
-@@ -418,11 +424,26 @@ cleanup:
- return status;
- }
-
-+static const char * proxyws_set_idle(cmd_parms *cmd, void *conf, const char *val)
-+{
-+ proxyws_dir_conf *dconf = conf;
-+ if (ap_timeout_parameter_parse(val, &(dconf->idle_timeout), "s") != APR_SUCCESS)
-+ return "ProxyWebsocketIdleTimeout timeout has wrong format";
-+
-+ if (dconf->idle_timeout < 0)
-+ return "ProxyWebsocketIdleTimeout timeout has to be a non-negative number";
-+
-+ if (!dconf->idle_timeout) dconf->idle_timeout = -1; /* loop indefinitely */
-+
-+ return NULL;
-+}
-+
- static void *create_proxyws_dir_config(apr_pool_t *p, char *dummy)
- {
- proxyws_dir_conf *new =
- (proxyws_dir_conf *) apr_pcalloc(p, sizeof(proxyws_dir_conf));
-
-+ new->idle_timeout = -1; /* no timeout */
- new->fallback_to_proxy_http = 1;
-
- return (void *) new;
-@@ -465,7 +486,8 @@ static const command_rec ws_proxy_cmds[] =
- proxyws_fallback_to_proxy_http, NULL, RSRC_CONF|ACCESS_CONF,
- "whether to let mod_proxy_http handle the upgrade and tunneling, "
- "On by default"),
--
-+ AP_INIT_TAKE1("ProxyWebsocketIdleTimeout", proxyws_set_idle, NULL, RSRC_CONF|ACCESS_CONF,
-+ "timeout for activity in either direction, unlimited by default."),
- {NULL}
- };
-
diff --git a/httpd-2.4.48-r1825120.patch b/httpd-2.4.48-r1825120.patch
deleted file mode 100644
index 4eb0a59..0000000
--- a/httpd-2.4.48-r1825120.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
-index 4e2e80d..10a2c86 100644
---- a/modules/ssl/ssl_engine_init.c
-+++ b/modules/ssl/ssl_engine_init.c
-@@ -2256,51 +2256,6 @@ int ssl_proxy_section_post_config(apr_pool_t *p, apr_pool_t *plog,
- return OK;
- }
-
--static int ssl_init_FindCAList_X509NameCmp(const X509_NAME * const *a,
-- const X509_NAME * const *b)
--{
-- return(X509_NAME_cmp(*a, *b));
--}
--
--static void ssl_init_PushCAList(STACK_OF(X509_NAME) *ca_list,
-- server_rec *s, apr_pool_t *ptemp,
-- const char *file)
--{
-- int n;
-- STACK_OF(X509_NAME) *sk;
--
-- sk = (STACK_OF(X509_NAME) *)
-- SSL_load_client_CA_file(file);
--
-- if (!sk) {
-- return;
-- }
--
-- for (n = 0; n < sk_X509_NAME_num(sk); n++) {
-- X509_NAME *name = sk_X509_NAME_value(sk, n);
--
-- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02209)
-- "CA certificate: %s",
-- modssl_X509_NAME_to_string(ptemp, name, 0));
--
-- /*
-- * note that SSL_load_client_CA_file() checks for duplicates,
-- * but since we call it multiple times when reading a directory
-- * we must also check for duplicates ourselves.
-- */
--
-- if (sk_X509_NAME_find(ca_list, name) < 0) {
-- /* this will be freed when ca_list is */
-- sk_X509_NAME_push(ca_list, name);
-- }
-- else {
-- /* need to free this ourselves, else it will leak */
-- X509_NAME_free(name);
-- }
-- }
--
-- sk_X509_NAME_free(sk);
--}
-
- static apr_status_t ssl_init_ca_cert_path(server_rec *s,
- apr_pool_t *ptemp,
-@@ -2324,7 +2279,7 @@ static apr_status_t ssl_init_ca_cert_path(server_rec *s,
- }
- file = apr_pstrcat(ptemp, path, "/", direntry.name, NULL);
- if (ca_list) {
-- ssl_init_PushCAList(ca_list, s, ptemp, file);
-+ SSL_add_file_cert_subjects_to_stack(ca_list, file);
- }
- if (xi_list) {
- load_x509_info(ptemp, xi_list, file);
-@@ -2341,19 +2296,13 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s,
- const char *ca_file,
- const char *ca_path)
- {
-- STACK_OF(X509_NAME) *ca_list;
--
-- /*
-- * Start with a empty stack/list where new
-- * entries get added in sorted order.
-- */
-- ca_list = sk_X509_NAME_new(ssl_init_FindCAList_X509NameCmp);
-+ STACK_OF(X509_NAME) *ca_list = sk_X509_NAME_new_null();;
-
- /*
- * Process CA certificate bundle file
- */
- if (ca_file) {
-- ssl_init_PushCAList(ca_list, s, ptemp, ca_file);
-+ SSL_add_file_cert_subjects_to_stack(ca_list, ca_file);
- /*
- * If ca_list is still empty after trying to load ca_file
- * then the file failed to load, and users should hear about that.
-@@ -2377,11 +2326,6 @@ STACK_OF(X509_NAME) *ssl_init_FindCAList(server_rec *s,
- return NULL;
- }
-
-- /*
-- * Cleanup
-- */
-- (void) sk_X509_NAME_set_cmp_func(ca_list, NULL);
--
- return ca_list;
- }
-
diff --git a/httpd-2.4.48-r1828172+.patch b/httpd-2.4.48-r1828172+.patch
deleted file mode 100644
index 2b99d69..0000000
--- a/httpd-2.4.48-r1828172+.patch
+++ /dev/null
@@ -1,1411 +0,0 @@
---- httpd-2.4.48/modules/generators/cgi_common.h.r1828172+
-+++ httpd-2.4.48/modules/generators/cgi_common.h
-@@ -0,0 +1,366 @@
-+/* Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements. See the NOTICE file distributed with
-+ * this work for additional information regarding copyright ownership.
-+ * The ASF licenses this file to You under the Apache License, Version 2.0
-+ * (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+#include "apr.h"
-+#include "apr_strings.h"
-+#include "apr_buckets.h"
-+#include "apr_lib.h"
-+#include "apr_poll.h"
-+
-+#define APR_WANT_STRFUNC
-+#define APR_WANT_MEMFUNC
-+#include "apr_want.h"
-+
-+#include "httpd.h"
-+#include "util_filter.h"
-+
-+static void discard_script_output(apr_bucket_brigade *bb)
-+{
-+ apr_bucket *e;
-+ const char *buf;
-+ apr_size_t len;
-+
-+ for (e = APR_BRIGADE_FIRST(bb);
-+ e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e);
-+ e = APR_BRIGADE_FIRST(bb))
-+ {
-+ if (apr_bucket_read(e, &buf, &len, APR_BLOCK_READ)) {
-+ break;
-+ }
-+ apr_bucket_delete(e);
-+ }
-+}
-+
-+#ifdef WANT_CGI_BUCKET
-+/* A CGI bucket type is needed to catch any output to stderr from the
-+ * script; see PR 22030. */
-+static const apr_bucket_type_t bucket_type_cgi;
-+
-+struct cgi_bucket_data {
-+ apr_pollset_t *pollset;
-+ request_rec *r;
-+ apr_interval_time_t timeout;
-+};
-+
-+/* Create a CGI bucket using pipes from script stdout 'out'
-+ * and stderr 'err', for request 'r'. */
-+static apr_bucket *cgi_bucket_create(request_rec *r,
-+ apr_interval_time_t timeout,
-+ apr_file_t *out, apr_file_t *err,
-+ apr_bucket_alloc_t *list)
-+{
-+ apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+ apr_status_t rv;
-+ apr_pollfd_t fd;
-+ struct cgi_bucket_data *data = apr_palloc(r->pool, sizeof *data);
-+
-+ /* Disable APR timeout handling since we'll use poll() entirely. */
-+ apr_file_pipe_timeout_set(out, 0);
-+ apr_file_pipe_timeout_set(err, 0);
-+
-+ APR_BUCKET_INIT(b);
-+ b->free = apr_bucket_free;
-+ b->list = list;
-+ b->type = &bucket_type_cgi;
-+ b->length = (apr_size_t)(-1);
-+ b->start = -1;
-+
-+ /* Create the pollset */
-+ rv = apr_pollset_create(&data->pollset, 2, r->pool, 0);
-+ if (rv != APR_SUCCESS) {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01217)
-+ "apr_pollset_create(); check system or user limits");
-+ return NULL;
-+ }
-+
-+ fd.desc_type = APR_POLL_FILE;
-+ fd.reqevents = APR_POLLIN;
-+ fd.p = r->pool;
-+ fd.desc.f = out; /* script's stdout */
-+ fd.client_data = (void *)1;
-+ rv = apr_pollset_add(data->pollset, &fd);
-+ if (rv != APR_SUCCESS) {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01218)
-+ "apr_pollset_add(); check system or user limits");
-+ return NULL;
-+ }
-+
-+ fd.desc.f = err; /* script's stderr */
-+ fd.client_data = (void *)2;
-+ rv = apr_pollset_add(data->pollset, &fd);
-+ if (rv != APR_SUCCESS) {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01219)
-+ "apr_pollset_add(); check system or user limits");
-+ return NULL;
-+ }
-+
-+ data->r = r;
-+ data->timeout = timeout;
-+ b->data = data;
-+ return b;
-+}
-+
-+/* Create a duplicate CGI bucket using given bucket data */
-+static apr_bucket *cgi_bucket_dup(struct cgi_bucket_data *data,
-+ apr_bucket_alloc_t *list)
-+{
-+ apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
-+ APR_BUCKET_INIT(b);
-+ b->free = apr_bucket_free;
-+ b->list = list;
-+ b->type = &bucket_type_cgi;
-+ b->length = (apr_size_t)(-1);
-+ b->start = -1;
-+ b->data = data;
-+ return b;
-+}
-+
-+/* Handle stdout from CGI child. Duplicate of logic from the _read
-+ * method of the real APR pipe bucket implementation. */
-+static apr_status_t cgi_read_stdout(apr_bucket *a, apr_file_t *out,
-+ const char **str, apr_size_t *len)
-+{
-+ char *buf;
-+ apr_status_t rv;
-+
-+ *str = NULL;
-+ *len = APR_BUCKET_BUFF_SIZE;
-+ buf = apr_bucket_alloc(*len, a->list); /* XXX: check for failure? */
-+
-+ rv = apr_file_read(out, buf, len);
-+
-+ if (rv != APR_SUCCESS && rv != APR_EOF) {
-+ apr_bucket_free(buf);
-+ return rv;
-+ }
-+
-+ if (*len > 0) {
-+ struct cgi_bucket_data *data = a->data;
-+ apr_bucket_heap *h;
-+
-+ /* Change the current bucket to refer to what we read */
-+ a = apr_bucket_heap_make(a, buf, *len, apr_bucket_free);
-+ h = a->data;
-+ h->alloc_len = APR_BUCKET_BUFF_SIZE; /* note the real buffer size */
-+ *str = buf;
-+ APR_BUCKET_INSERT_AFTER(a, cgi_bucket_dup(data, a->list));
-+ }
-+ else {
-+ apr_bucket_free(buf);
-+ a = apr_bucket_immortal_make(a, "", 0);
-+ *str = a->data;
-+ }
-+ return rv;
-+}
-+
-+/* Read method of CGI bucket: polls on stderr and stdout of the child,
-+ * sending any stderr output immediately away to the error log. */
-+static apr_status_t cgi_bucket_read(apr_bucket *b, const char **str,
-+ apr_size_t *len, apr_read_type_e block)
-+{
-+ struct cgi_bucket_data *data = b->data;
-+ apr_interval_time_t timeout = 0;
-+ apr_status_t rv;
-+ int gotdata = 0;
-+
-+ if (block != APR_NONBLOCK_READ) {
-+ timeout = data->timeout > 0 ? data->timeout : data->r->server->timeout;
-+ }
-+
-+ do {
-+ const apr_pollfd_t *results;
-+ apr_int32_t num;
-+
-+ rv = apr_pollset_poll(data->pollset, timeout, &num, &results);
-+ if (APR_STATUS_IS_TIMEUP(rv)) {
-+ if (timeout) {
-+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, data->r, APLOGNO(01220)
-+ "Timeout waiting for output from CGI script %s",
-+ data->r->filename);
-+ return rv;
-+ }
-+ else {
-+ return APR_EAGAIN;
-+ }
-+ }
-+ else if (APR_STATUS_IS_EINTR(rv)) {
-+ continue;
-+ }
-+ else if (rv != APR_SUCCESS) {
-+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, data->r, APLOGNO(01221)
-+ "poll failed waiting for CGI child");
-+ return rv;
-+ }
-+
-+ for (; num; num--, results++) {
-+ if (results[0].client_data == (void *)1) {
-+ /* stdout */
-+ rv = cgi_read_stdout(b, results[0].desc.f, str, len);
-+ if (APR_STATUS_IS_EOF(rv)) {
-+ rv = APR_SUCCESS;
-+ }
-+ gotdata = 1;
-+ } else {
-+ /* stderr */
-+ apr_status_t rv2 = log_script_err(data->r, results[0].desc.f);
-+ if (APR_STATUS_IS_EOF(rv2)) {
-+ apr_pollset_remove(data->pollset, &results[0]);
-+ }
-+ }
-+ }
-+
-+ } while (!gotdata);
-+
-+ return rv;
-+}
-+
-+static const apr_bucket_type_t bucket_type_cgi = {
-+ "CGI", 5, APR_BUCKET_DATA,
-+ apr_bucket_destroy_noop,
-+ cgi_bucket_read,
-+ apr_bucket_setaside_notimpl,
-+ apr_bucket_split_notimpl,
-+ apr_bucket_copy_notimpl
-+};
-+
-+#endif /* WANT_CGI_BUCKET */
-+
-+/* Handle the CGI response output, having set up the brigade with the
-+ * CGI or PIPE bucket as appropriate. */
-+static int cgi_handle_response(request_rec *r, int nph, apr_bucket_brigade *bb,
-+ apr_interval_time_t timeout, cgi_server_conf *conf,
-+ char *logdata, apr_file_t *script_err)
-+{
-+ apr_status_t rv;
-+
-+ /* Handle script return... */
-+ if (!nph) {
-+ const char *location;
-+ char sbuf[MAX_STRING_LEN];
-+ int ret;
-+
-+ if ((ret = ap_scan_script_header_err_brigade_ex(r, bb, sbuf,
-+ APLOG_MODULE_INDEX)))
-+ {
-+ /* In the case of a timeout reading script output, clear
-+ * the brigade to avoid a second attempt to read the
-+ * output. */
-+ if (ret == HTTP_GATEWAY_TIME_OUT) {
-+ apr_brigade_cleanup(bb);
-+ }
-+
-+ ret = log_script(r, conf, ret, logdata, sbuf, bb, script_err);
-+
-+ /*
-+ * ret could be HTTP_NOT_MODIFIED in the case that the CGI script
-+ * does not set an explicit status and ap_meets_conditions, which
-+ * is called by ap_scan_script_header_err_brigade, detects that
-+ * the conditions of the requests are met and the response is
-+ * not modified.
-+ * In this case set r->status and return OK in order to prevent
-+ * running through the error processing stack as this would
-+ * break with mod_cache, if the conditions had been set by
-+ * mod_cache itself to validate a stale entity.
-+ * BTW: We circumvent the error processing stack anyway if the
-+ * CGI script set an explicit status code (whatever it is) and
-+ * the only possible values for ret here are:
-+ *
-+ * HTTP_NOT_MODIFIED (set by ap_meets_conditions)
-+ * HTTP_PRECONDITION_FAILED (set by ap_meets_conditions)
-+ * HTTP_INTERNAL_SERVER_ERROR (if something went wrong during the
-+ * processing of the response of the CGI script, e.g broken headers
-+ * or a crashed CGI process).
-+ */
-+ if (ret == HTTP_NOT_MODIFIED) {
-+ r->status = ret;
-+ return OK;
-+ }
-+
-+ return ret;
-+ }
-+
-+ location = apr_table_get(r->headers_out, "Location");
-+
-+ if (location && r->status == 200) {
-+ /* For a redirect whether internal or not, discard any
-+ * remaining stdout from the script, and log any remaining
-+ * stderr output, as normal. */
-+ discard_script_output(bb);
-+ apr_brigade_destroy(bb);
-+
-+ if (script_err) {
-+ apr_file_pipe_timeout_set(script_err, timeout);
-+ log_script_err(r, script_err);
-+ }
-+ }
-+
-+ if (location && location[0] == '/' && r->status == 200) {
-+ /* This redirect needs to be a GET no matter what the original
-+ * method was.
-+ */
-+ r->method = "GET";
-+ r->method_number = M_GET;
-+
-+ /* We already read the message body (if any), so don't allow
-+ * the redirected request to think it has one. We can ignore
-+ * Transfer-Encoding, since we used REQUEST_CHUNKED_ERROR.
-+ */
-+ apr_table_unset(r->headers_in, "Content-Length");
-+
-+ ap_internal_redirect_handler(location, r);
-+ return OK;
-+ }
-+ else if (location && r->status == 200) {
-+ /* XXX: Note that if a script wants to produce its own Redirect
-+ * body, it now has to explicitly *say* "Status: 302"
-+ */
-+ discard_script_output(bb);
-+ apr_brigade_destroy(bb);
-+ return HTTP_MOVED_TEMPORARILY;
-+ }
-+
-+ rv = ap_pass_brigade(r->output_filters, bb);
-+ }
-+ else /* nph */ {
-+ struct ap_filter_t *cur;
-+
-+ /* get rid of all filters up through protocol... since we
-+ * haven't parsed off the headers, there is no way they can
-+ * work
-+ */
-+
-+ cur = r->proto_output_filters;
-+ while (cur && cur->frec->ftype < AP_FTYPE_CONNECTION) {
-+ cur = cur->next;
-+ }
-+ r->output_filters = r->proto_output_filters = cur;
-+
-+ rv = ap_pass_brigade(r->output_filters, bb);
-+ }
-+
-+ /* don't soak up script output if errors occurred writing it
-+ * out... otherwise, we prolong the life of the script when the
-+ * connection drops or we stopped sending output for some other
-+ * reason */
-+ if (script_err && rv == APR_SUCCESS && !r->connection->aborted) {
-+ apr_file_pipe_timeout_set(script_err, timeout);
-+ log_script_err(r, script_err);
-+ }
-+
-+ if (script_err) apr_file_close(script_err);
-+
-+ return OK; /* NOT r->status, even if it has changed. */
-+}
---- httpd-2.4.48/modules/generators/config5.m4.r1828172+
-+++ httpd-2.4.48/modules/generators/config5.m4
-@@ -78,4 +78,15 @@
-
- APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
-
-+AC_ARG_ENABLE(cgid-fdpassing,
-+ [APACHE_HELP_STRING(--enable-cgid-fdpassing,Enable experimental mod_cgid support for fd passing)],
-+ [if test "$enableval" = "yes"; then
-+ AC_CHECK_DECL(CMSG_DATA,
-+ [AC_DEFINE([HAVE_CGID_FDPASSING], 1, [Enable FD passing support in mod_cgid])],
-+ [AC_MSG_ERROR([cannot support mod_cgid fd-passing on this system])], [
-+#include Description: Restricts the total size of the HTTP request body sent
- from the client Syntax: LimitRequestBody bytesDefault: LimitRequestBody 0Default: LimitRequestBody 1073741824Context: server config, virtual host, directory, .htaccess Override: All Status: Core Module: core Compatibility: In Apache HTTP Server 2.4.53 and earlier, the default value
-+ was 0 (unlimited)
This directive specifies the number of bytes from 0 -- (meaning unlimited) to 2147483647 (2GB) that are allowed in a -- request body. See the note below for the limited applicability -- to proxy requests.
-+This directive specifies the number of bytes -+ that are allowed in a request body. A value of 0 means unlimited.
- -The LimitRequestBody directive allows
- the user to set a limit on the allowed size of an HTTP request
-@@ -2831,12 +2831,6 @@ from the client
-
-
LimitRequestBody 102400- -- --
For a full description of how this directive is interpreted by
-- proxy requests, see the mod_proxy documentation.
LimitRequestFields Directive
-diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en -index ee7b1e3..233d234 100644 ---- a/docs/manual/mod/mod_proxy.html.en -+++ b/docs/manual/mod/mod_proxy.html.en -@@ -463,9 +463,6 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10 - Content-Length header, but the server is configured to filter incoming - request bodies. - --LimitRequestBody only applies to
-- request bodies that the server will spool to disk