X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_load_balance.cpp;h=c91791bcb67f6931b1e31676d44e05b7c8cfc45b;hb=677a15e766a782dd2064451213e4fe484784c5ee;hp=57e112387cb95fe3af1eadddb4a61d96d3683b2f;hpb=511c535c4938dfc01450e8748508899401a5e4ea;p=metaproxy-moved-to-github.git diff --git a/src/filter_load_balance.cpp b/src/filter_load_balance.cpp index 57e1123..c91791b 100644 --- a/src/filter_load_balance.cpp +++ b/src/filter_load_balance.cpp @@ -1,7 +1,22 @@ -/* $Id: filter_load_balance.cpp,v 1.5 2007-01-04 13:22:56 marc Exp $ - Copyright (c) 2005-2006, Index Data. +/* $Id: filter_load_balance.cpp,v 1.10 2008-02-20 15:07:52 adam Exp $ + Copyright (c) 2005-2007, Index Data. - See the LICENSE file for details +This file is part of Metaproxy. + +Metaproxy is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Metaproxy; see the file LICENSE. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ #include "config.hpp" @@ -11,11 +26,17 @@ #include "filter_load_balance.hpp" #include "util.hpp" + #include #include #include +// remove max macro if already defined (defined later in ) +#ifdef max +#undef max +#endif + //#include #include #include @@ -81,7 +102,7 @@ yf::LoadBalance::~LoadBalance() { // must have a destructor because of boost::scoped_ptr } -void yf::LoadBalance::configure(const xmlNode *xmlnode) +void yf::LoadBalance::configure(const xmlNode *xmlnode, bool test_only) { m_p->configure(xmlnode); } @@ -168,7 +189,7 @@ void yf::LoadBalance::Impl::process(mp::Package &package) // copying new target into init package mp::util::set_vhost_otherinfo(&(org_init->otherInfo), - odr_en, target); + odr_en, target, 1); package.request() = gdu_req; }