X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_http_file.cpp;h=5d376018bf2fc35aaa3c58ccbfe84096055afc69;hb=8ced8e7b5de3ecba12ac68ce5c5e8cddf40d800f;hp=25ad1b9384779dcbbc283bd0959c465a68ff1b80;hpb=8cde75331b5886eba4304ab076409d1ebfbea4eb;p=metaproxy-moved-to-github.git diff --git a/src/filter_http_file.cpp b/src/filter_http_file.cpp index 25ad1b9..5d37601 100644 --- a/src/filter_http_file.cpp +++ b/src/filter_http_file.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2012 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 @@ -105,7 +105,7 @@ std::string yf::HttpFile::Rep::get_mime_type(std::string &fname) { std::string file_part = fname; std::string::size_type p = fname.find_last_of('/'); - + if (p != std::string::npos) file_part = fname.substr(p+1); @@ -129,7 +129,7 @@ void yf::HttpFile::Rep::fetch_file(mp::Session &session, std::string &fname, mp::Package &package) { mp::odr o; - + FILE *f = fopen(fname.c_str(), "rb"); if (!f) { @@ -170,7 +170,7 @@ void yf::HttpFile::Rep::fetch_file(mp::Session &session, } } fclose(f); - + std::string content_type = get_mime_type(fname); z_HTTP_header_add(o, &hres->headers, @@ -184,7 +184,7 @@ void yf::HttpFile::Rep::fetch_uri(mp::Session &session, bool sane = true; std::string::size_type p; std::string path = req->path; - + p = path.find("#"); if (p != std::string::npos) path = path.erase(p); @@ -218,7 +218,7 @@ void yf::HttpFile::Rep::fetch_uri(mp::Session &session, } package.move(); } - + void yf::HttpFile::process(mp::Package &package) const { Z_GDU *gdu = package.request().get(); @@ -246,7 +246,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only, throw mp::filter::FilterException ("Can not open mime types file " + fname); } - + std::vector args; while (f.getline(args)) { @@ -263,14 +263,14 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only, { if (a_node->type != XML_ELEMENT_NODE) continue; - + if (mp::xml::is_element_mp(a_node, "documentroot")) a.m_file_root = mp::xml::get_text(a_node); else if (mp::xml::is_element_mp(a_node, "prefix")) a.m_url_path_prefix = mp::xml::get_text(a_node); else throw mp::filter::FilterException - ("Bad element " + ("Bad element " + std::string((const char *) a_node->name) + " in area section" ); @@ -283,7 +283,7 @@ void mp::filter::HttpFile::configure(const xmlNode * ptr, bool test_only, else { throw mp::filter::FilterException - ("Bad element " + ("Bad element " + std::string((const char *) ptr->name) + " in virt_db filter"); }