You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/01/04 16:10:21 UTC
svn commit: r1428916 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/proxy/proxy_util.c
Author: jim
Date: Fri Jan 4 15:10:21 2013
New Revision: 1428916
URL: http://svn.apache.org/viewvc?rev=1428916&view=rev
Log:
non-existance of byrequests is not an immediate error
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1428916&r1=1428915&r2=1428916&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Fri Jan 4 15:10:21 2013
@@ -1 +1 @@
-2432
+2434
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1428916&r1=1428915&r2=1428916&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Jan 4 15:10:21 2013
@@ -1142,13 +1142,10 @@ PROXY_DECLARE(char *) ap_proxy_define_ba
memset(*balancer, 0, sizeof(proxy_balancer));
/*
- * NOTE: The default method is byrequests, which we assume
- * exists!
+ * NOTE: The default method is byrequests - if it doesn't
+ * exist, that's OK at this time. We check when we share and sync
*/
lbmethod = ap_lookup_provider(PROXY_LBMETHOD, "byrequests", "0");
- if (!lbmethod) {
- return "Can't find 'byrequests' lb method";
- }
(*balancer)->workers = apr_array_make(p, 5, sizeof(proxy_worker *));
(*balancer)->gmutex = NULL;
@@ -1219,9 +1216,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
balancer->s->index = i;
/* the below should always succeed */
lbmethod = ap_lookup_provider(PROXY_LBMETHOD, balancer->s->lbpname, "0");
- if (lbmethod)
+ if (lbmethod) {
balancer->lbmethod = lbmethod;
-
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, APLOGNO(02432)
+ "Cannot find LB Method: %s", balancer->s->lbpname);
+ return APR_EINVAL;
+ }
if (*balancer->s->nonce == PROXY_UNSET_NONCE) {
char nonce[APR_UUID_FORMATTED_LENGTH + 1];
apr_uuid_t uuid;
@@ -2717,7 +2718,12 @@ PROXY_DECLARE(apr_status_t) ap_proxy_syn
lbmethod = ap_lookup_provider(PROXY_LBMETHOD, b->s->lbpname, "0");
if (lbmethod) {
b->lbmethod = lbmethod;
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s, APLOGNO(02433)
+ "Cannot find LB Method: %s", b->s->lbpname);
+ return APR_EINVAL;
}
+
/* worker sync */
/*