You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2020/06/30 12:29:06 UTC
svn commit: r1879363 - /httpd/httpd/trunk/modules/proxy/mod_proxy.c
Author: ylavic
Date: Tue Jun 30 12:29:06 2020
New Revision: 1879363
URL: http://svn.apache.org/viewvc?rev=1879363&view=rev
Log:
Revert r1879361: 2.4.x material only.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1879363&r1=1879362&r2=1879363&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Tue Jun 30 12:29:06 2020
@@ -2185,21 +2185,10 @@ static const char *
PROXY_COPY_CONF_PARAMS(worker, conf);
}
else if ((use_regex != 0) ^ (worker->s->is_name_matchable != 0)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(10249)
- "ProxyPass/<Proxy> and ProxyPassMatch/<ProxyMatch> "
- "can't be used altogether with the same worker "
- "name (%s); ignoring ProxyPass%s",
- worker->s->name, use_regex ? "Match" : "");
- /* Rollback new alias */
- if (cmd->path) {
- dconf->alias = NULL;
- dconf->alias_set = 0;
- }
- else {
- memset(new, 0, sizeof(*new));
- apr_array_pop(conf->aliases);
- }
- return NULL;
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "
+ "ProxyPassMatch/<ProxyMatch> can't be used "
+ "together with the same worker name ",
+ "(", worker->s->name, ")", NULL);
}
else {
reuse = 1;
@@ -2966,15 +2955,10 @@ static const char *proxysection(cmd_parm
" ", err, NULL);
}
else if ((use_regex != 0) ^ (worker->s->is_name_matchable != 0)) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, APLOGNO(10250)
- "ProxyPass/<Proxy> and ProxyPassMatch/<ProxyMatch> "
- "can't be used altogether with the same worker "
- "name (%s); ignoring <Proxy%s>",
- worker->s->name, use_regex ? "Match" : "");
- /* Rollback new section */
- ((void **)sconf->sec_proxy->elts)[sconf->sec_proxy->nelts - 1] = NULL;
- apr_array_pop(sconf->sec_proxy);
- goto cleanup;
+ return apr_pstrcat(cmd->temp_pool, "ProxyPass/<Proxy> and "
+ "ProxyPassMatch/<ProxyMatch> can't be used "
+ "altogether with the same worker name ",
+ "(", worker->s->name, ")", NULL);
}
if (!worker->section_config) {
worker->section_config = new_dir_conf;
@@ -3005,7 +2989,6 @@ static const char *proxysection(cmd_parm
}
}
-cleanup:
cmd->path = old_path;
cmd->override = old_overrides;