X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_cgi.cpp;h=6a452ada72d187c03cca5a3caf19efae26afb02e;hb=a5dc369fbffd8e27cde8557a7aa640dc0f222aef;hp=b4d12a6a0240adde3b878059c738820ffafaff6d;hpb=4bfec20c393570a81471c644fad6268eed3dba29;p=metaproxy-moved-to-github.git diff --git a/src/filter_cgi.cpp b/src/filter_cgi.cpp index b4d12a6..6a452ad 100644 --- a/src/filter_cgi.cpp +++ b/src/filter_cgi.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2011 Index Data + Copyright (C) 2005-2013 Index Data 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 @@ -54,14 +54,14 @@ namespace metaproxy_1 { yf::CGI::CGI() : m_p(new Rep) { - + } yf::CGI::Rep::~Rep() { std::map::const_iterator it; boost::mutex::scoped_lock lock(m_mutex); - + for (it = children.begin(); it != children.end(); it++) kill(it->second, SIGTERM); } @@ -74,10 +74,10 @@ void yf::CGI::process(mp::Package &package) const { Z_GDU *zgdu_req = package.request().get(); Z_GDU *zgdu_res = 0; - + if (!zgdu_req) return; - + if (zgdu_req->which != Z_GDU_HTTP_Request) { package.move(); @@ -105,7 +105,7 @@ void yf::CGI::process(mp::Package &package) const int r; pid_t pid; int status; - + pid = ::fork(); switch (pid) { @@ -165,7 +165,7 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path) exec.program = mp::xml::get_text(attr->children); else throw mp::filter::FilterException - ("Bad attribute " + ("Bad attribute " + std::string((const char *) attr->name) + " in cgi section"); } @@ -173,7 +173,7 @@ void yf::CGI::configure(const xmlNode *ptr, bool test_only, const char *path) } else { - throw mp::filter::FilterException("Bad element " + throw mp::filter::FilterException("Bad element " + std::string((const char *) ptr->name)); }